summaryrefslogtreecommitdiff
path: root/src/chroot-tools
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-04-14 19:52:46 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-04-14 19:52:46 -0400
commit94e6c6f983be950a57cb355334f2685e29a950e7 (patch)
tree327f0d48c21d88038279ff6735720faaa8d04ef2 /src/chroot-tools
parentfb1a64c4cfc1417609a465f739af7bc5ef827bb6 (diff)
librechroot: minor fixups
Diffstat (limited to 'src/chroot-tools')
-rwxr-xr-xsrc/chroot-tools/librechroot9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index da04663..ee3ffb8 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -5,7 +5,7 @@ set -euE
# Copyright (C) 2010-2012 Nicolás Reynolds <fauno@parabola.nu>
# Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
# Copyright (C) 2012 Michał Masłowski <mtjm@mtjm.eu>
-# Copyright (C) 2012-2015 Luke Shumaker <lukeshu@sbcglobal.net>
+# Copyright (C) 2012-2016 Luke Shumaker <lukeshu@sbcglobal.net>
#
# License: GNU GPLv2+
#
@@ -182,6 +182,10 @@ usage() {
is made after the file is copied in; the `-C` flag doesn'\''t
stop the change from being effective.'
echo
+ prose 'The processor architecture of the chroot is determined
+ by the by `CARCH` variable in the `/etc/makepkg.conf`
+ file inside of the chroot.'
+ echo
prose 'Creating a copy, deleting a copy, or syncing a copy can be fairly
slow; but are very fast if $CHROOTDIR is on a btrfs partition.'
echo
@@ -319,7 +323,6 @@ main() {
# XXX: SYSTEMD-STDIN HACK
if ! [[ -t 0 ]]; then
error "Input is not a TTY"
- plain "https://labs.parabola.nu/issues/420"
plain "https://labs.parabola.nu/issues/431"
plain "https://bugs.freedesktop.org/show_bug.cgi?id=70290"
prose "Due to a bug in systemd-nspawn, redirecting stdin is not
@@ -327,7 +330,7 @@ main() {
return 1
fi
- # Keep this lock as long as we are running
+ # Keep this lock for as long as we are running
# Note that '9' is the same FD number as in mkarchroot et al.
lock 9 "$copydir.lock" \
"Waiting for existing lock on chroot copy to be released: [%s]" "$COPY"