X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap.clp;h=b617cd1cd5c328e6cf5d524d7545e6c6254432f9;hp=f3b4a78b7d7dc7db2699f92deef69241e5fb5170;hb=2353722d53b5e53766e4e90605d31333343b381a;hpb=d6f0f6fda6c1ed1b71629ee305e3daa16708d21b

diff --git a/grml-debootstrap.clp b/grml-debootstrap.clp
index f3b4a78..b617cd1 100644
--- a/grml-debootstrap.clp
+++ b/grml-debootstrap.clp
@@ -7,7 +7,7 @@
 # grml
 #
 # @Author:  Tong SUN
-# @Release: $Revision: 1.1 $, under the BSD license
+# @Release: $Revision: 1.3 $
 # @HomeURL: http://xpt.sourceforge.net/
 #
 
@@ -19,10 +19,13 @@
 
 
 
-eval set -- `getopt \
-  -o +m:i:r:t:p:c:hv --long \
-    mirror:,iso:,release:,target:,mntpoint:,debopt:,interactive,config:,packages::,debconf::,keep_src_list,hostname:,password:,bootappend:,groot:,grub:,help,version \
+_opt_temp=`getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:vhV --long \
+    mirror:,iso:,release:,target:,mntpoint:,debopt:,interactive,nodebootstrap,config:,confdir:,packages::,debconf::,keep_src_list,hostname:,password:,bootappend:,groot:,grub:,verbose,help,version \
   -- "$@"`
+if [ $? != 0 ]; then
+  eerror "Try 'grml-debootstrap --help' for more information."; eend 1; exit 1
+fi
+eval set -- "$_opt_temp"
 
 while :; do
   case "$1" in
@@ -49,17 +52,23 @@ while :; do
   --interactive)       # Use interactive mode (frontend).
     _opt_interactive=T
     ;;
+  --nodebootstrap)     # Skip debootstrap, only do configuration to the target.
+    _opt_nodebootstrap=T
+    ;;
   #
 
   # == Configuration options
   --config|-c)         # Use specified configuration file, defaults to /etc/debootstr
     shift; _opt_config="$1"
     ;;
-  --packages)          # Install packages defined in /etc/debootstrap/packages. Optio
+  --confdir|-d)        # Place of config files for debootstrap, defaults to /etc/debo
+    shift; _opt_confdir="$1"
+    ;;
+  --packages)          # Install packages defined in <confdir>/packages. Option arg:
     shift; _opt_packages="$1"
     _opt_packages_set=T
     ;;
-  --debconf)           # Pre-seed packages using /etc/debootstrap/debconf-selections.
+  --debconf)           # Pre-seed packages using <confdir>/debconf-selections. Option
     shift; _opt_debconf="$1"
     _opt_debconf_set=T
     ;;
@@ -84,10 +93,14 @@ while :; do
     ;;
 
   # == Other options
+  --verbose|-v)        # Increase verbosity.
+    if [ "$_opt_verbose" ]; then _opt_verbose=`expr $_opt_verbose + 1`
+    else _opt_verbose=1; fi
+    ;;
   --help|-h)           # Print this usage information and exit.
     _opt_help=T
     ;;
-  --version|-v)        # Show summary of options and exit.
+  --version|-V)        # Show summary of options and exit.
     _opt_version=T
     ;;
   --)