summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-24 11:07:51 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-24 11:07:51 -0400
commitfb45cda4806a9dae1fd07dfdacba45448d85bda2 (patch)
tree06e424a0f807588fbccaa3f4b65769506bbbc16b
parent5862f234db5cb5237430453539ab0120286df838 (diff)
parent35dc7485fb1bbbe6c1dc236f35702561516f0836 (diff)
downloaddevtools-fb45cda4806a9dae1fd07dfdacba45448d85bda2.tar.xz
Merge commit '35dc74' into complete
-rw-r--r--archbuild.in2
-rw-r--r--makechrootpkg.in10
2 files changed, 6 insertions, 6 deletions
diff --git a/archbuild.in b/archbuild.in
index a343bec..4dcc0f3 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -2,7 +2,7 @@
m4_include(lib/common.sh)
-base_packages=(base base-devel sudo)
+base_packages=(base-devel)
makechrootpkg_args=(-c -n)
cmd="${0##*/}"
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 39d57e9..717e02f 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -41,7 +41,7 @@ usage() {
echo ''
echo 'The chroot "root" directory must be created via the following'
echo 'command:'
- echo ' mkarchroot <chrootdir>/root base base-devel sudo'
+ echo ' mkarchroot <chrootdir>/root base-devel'
echo ''
echo "Default makepkg args: $makepkg_args"
echo ''
@@ -78,9 +78,6 @@ done
# Canonicalize chrootdir, getting rid of trailing /
chrootdir=$(readlink -e "$passeddir")
-# Detect chrootdir filesystem type
-chroottype=$(stat -f -c %T "$chrootdir")
-
if [[ ${copy:0:1} = / ]]; then
copydir=$copy
else
@@ -112,11 +109,14 @@ if [[ ! -d $chrootdir ]]; then
fi
if [[ ! -d $chrootdir/root ]]; then
- die "Missing chroot dir root directory. Try using: mkarchroot $chrootdir/root base base-devel sudo"
+ die "Missing chroot dir root directory. Try using: mkarchroot $chrootdir/root base-devel"
fi
umask 0022
+# Detect chrootdir filesystem type
+chroottype=$(stat -f -c %T "$chrootdir")
+
# Lock the chroot we want to use. We'll keep this lock until we exit.
# Note this is the same FD number as in mkarchroot
lock_open_write 9 "$copydir.lock" "Locking chroot copy [$copy]"