From 7982a6af840eb8c37b3c2eed123bf4f66da8906a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Jun 2013 20:07:19 -0600 Subject: librechroot: improve documentation for -C and -M --- src/chroot-tools/librechroot | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index e353206..55b3324 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -71,18 +71,24 @@ usage() { echo " CHROOTDIR : ${CHROOTDIR:-ERROR: NO SETTING}" echo " CHROOT : ${CHROOT:-ERROR: NO SETTING}" echo " COPY : $COPY" - echo " root path : ${rootdir:-ERROR}" - echo " copy path : ${copydir:-ERROR}" + echo " rootdir : ${rootdir:-ERROR}" + echo " copydir : ${copydir:-ERROR}" echo '' echo 'If the chroot, or copy does not exist, it will be created' echo 'automatically. A chroot by default contains the packages in the' echo 'group "base-devel", and any packages named in $CHROOTEXTRAPKG.' + echo 'Unless the `-C` or `-M` flags are used, all configuration files' + echo 'are the stock versions supplied in the packages, not the versions' + echo 'from your host system.' echo '' echo 'This command will make the following configuration changes in' echo 'the chroot:' echo ' - overwrite `/etc/libretools.d/chroot.conf`' echo ' - overwrite `/etc/pacman.d/mirrorlist`' echo ' - set `CacheDir` in `/etc/pacman.conf`' + echo 'If a new `pacman.conf` is inserted with the `-C` flag, the change' + echo "is made after the file is copied in; the \`-C\` flag doesn't stop" + echo 'the change from being effective.' echo '' echo 'Creating a copy, deleting a copy, or syncing a copy can be fairly' echo 'slow; but are very fast if $CHROOTDIR is on a btrfs partition.' @@ -91,8 +97,8 @@ usage() { echo ' -n Name of the chroot to use' echo ' -l Name of, or absolute path to, the copy to use' echo ' -N Disable networking in the chroot' - echo ' -C Location of pacman config file' - echo ' -M Location of makepkg config file' + echo ' -C Copy this file to `$copydir/etc/pacman.conf`' + echo ' -M Copy this file to `$copydir/etc/makepkg.conf`' echo '' echo 'Commands:' echo ' Create/copy/delete:' -- cgit v1.2.3-54-g00ecf