X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=7244fbb3e291707d824334c67b343e3860833d1e;hp=f1b0afffc471c6640fb1d62fb81c14b0670086af;hb=6c99b7cbc6955faaaeb4462497e9d3f52724bbb6;hpb=828061e11237bba165023196c1def7f361d7cbcf;ds=sidebyside

diff --git a/grml-debootstrap b/grml-debootstrap
index f1b0aff..7244fbb 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Apr 16 20:31:21 CEST 2007 [mika]
+# Latest change: Mon Apr 16 20:39:13 CEST 2007 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 
@@ -41,16 +41,17 @@ usage() {
   echo
   einfo "Valid options:"
   echo  "
-    -h|--help              Print this usage information and exit.
-    -v|--version           Show summary of options and exit.
-
-    -t|--target <target>   Target partition (/dev/...) or directory.
-    -r|--release <release> Specify release of new Debian system. Supported relases: sarge, etch, lenny and sid.
-    -m|--mirror <URL>      Specify mirror which should be used for apt-get/aptitude.
-    -p|--mntpoint <mnt>    Specify mountpoint that should be used for mounting the target system.
-    --groot <device>       Specify root device for usage in grub (corresponds with \$TARGET).
-    --grub <device>        Where do you want to install grub to? Use grub syntax for specifying.
-    --password <pwd>       Use specified password as password for user root. Use with caution.
+    -h|--help                   Print this usage information and exit.
+    -v|--version                Show summary of options and exit.
+
+    -t|--target <target>        Target partition (/dev/...) or directory.
+    -r|--release <release>      Specify release of new Debian system. Supported relases: sarge, etch, lenny and sid.
+    -m|--mirror <URL>           Specify mirror which should be used for apt-get/aptitude.
+    -p|--mntpoint <mnt>         Specify mountpoint that should be used for mounting the target system.
+    --groot <device>            Specify root device for usage in grub (corresponds with \$TARGET).
+    --grub <device>             Where do you want to install grub to? Use grub syntax for specifying.
+    --password <pwd>            Use specified password as password for user root. Use with caution.
+    --boot_append <appendline>  Add specified appendline to kernel whilst booting
 
 "
 }
@@ -308,6 +309,8 @@ preparechroot() {
   cp /etc/debootstrap/packages        $MNTPOINT/etc/debootstrap/packages
   cp /etc/debootstrap/variables       $MNTPOINT/etc/debootstrap/variables
 
+  cp -a /etc/debootstrap/extrapackages/ $MNTPOINT/etc/debootstrap/
+
   # make sure we can access network [relevant for cdebootstrap]
   [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
 
@@ -387,7 +390,13 @@ done
   echo done > $STAGES/grml-debootstrap
 # }}}
 
-  einfo "Finished execution of $0 - enjoy your Debian system." ; eend 0
+if [ -n "$AUTOINSTALL" ] ; then
+   dialog --title "$0" --msgbox \
+          "Finished execution of ${0}.
+Enjoy your Debian system." 6 60
+else
+   einfo "Finished execution of $0 - enjoy your Debian system." ; eend 0
+fi
 
 ## END OF FILE #################################################################
 # vim: ai tw=100 expandtab foldmethod=marker