Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/makechrootpkg.in
diff options
context:
space:
mode:
Diffstat (limited to 'makechrootpkg.in')
-rw-r--r--makechrootpkg.in10
1 files changed, 5 insertions, 5 deletions
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]"