From: Michael Prokop <mika@grml.org>
Date: Wed, 8 Jul 2009 00:06:03 +0000 (+0200)
Subject: Slightly improve wording of -t and -p options
X-Git-Tag: v0.29~10
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=de48058f771e436855779976bde15a25dd3b4582;hp=1df19dabd733a9b7b5587efe51358a0b868df0d3

Slightly improve wording of -t and -p options
---

diff --git a/debian/changelog b/debian/changelog
index 445ee52..fc1b51f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ grml-debootstrap (0.29) UNRELEASED; urgency=low
   * Do not adjust mydestination and myhostname in /etc/postfix/main.cf as
     mydestination defaults to "$myhostname, localhost.$mydomain, localhost",
     myhostname defaults to gethostname() and mydomain to localdomain.
+  * Slightly improve wording of -t and -p options.
 
- -- Michael Prokop <mika@grml.org>  Wed, 08 Jul 2009 01:48:13 +0200
+ -- Michael Prokop <mika@grml.org>  Wed, 08 Jul 2009 02:05:44 +0200
 
 grml-debootstrap (0.28) unstable; urgency=low
 
diff --git a/grml-debootstrap b/grml-debootstrap
index 02015ce..64b46d5 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -40,8 +40,10 @@ Bootstrap options:
   -i, --iso <mnt>        Mountpoint where a Debian ISO is mounted to, for use
                            instead of fetching packages from a mirror.
   -r, --release <name>   Release of new Debian system (default: lenny).
-  -t, --target <target>  Target partition (/dev/...) or directory.
-  -p, --mntpoint <mnt>   Mountpoint used for mounting the target system.
+  -t, --target <target>  Target partition (/dev/...) or directory where the
+                         system should be installed to.
+  -p, --mntpoint <mnt>   Mountpoint used for mounting the target system,
+                         has no effect if -t is given and represents a directory.
       --debopt <params>  Extra parameters passed to the debootstrap command.
       --interactive      Use interactive mode (frontend).
       --nodebootstrap    Skip debootstrap, only do configuration to the target.
@@ -734,14 +736,14 @@ mount_target() {
 
 # install main chroot {{{
 debootstrap_system() {
-  if ! grep -q $MNTPOINT /proc/mounts ; then
+  if ! grep -q "$MNTPOINT" /proc/mounts ; then
      mount_target
   fi
   if [ "$_opt_nodebootstrap" ]; then
      einfo "Skipping debootstrap as requested."
      return
   fi
-  if grep -q $MNTPOINT /proc/mounts || [ -n "$DIRECTORY" ] ; then
+  if grep -q "$MNTPOINT" /proc/mounts || [ -n "$DIRECTORY" ] ; then
      einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}"
      [ -n "$MIRROR" ] && $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR || \
      $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO