for Issue555

[grml-debootstrap.git] / grml-debootstrap.clp

diff --git a/grml-debootstrap.clp b/grml-debootstrap.clp
index 4706be3..4e43b4a 100644 (file)
--- a/grml-debootstrap.clp
+++ b/grml-debootstrap.clp
@@ -7,7 +7,7 @@
 # grml
 #
 # @Author:  Tong SUN
-# @Release: $Revision: $, under the BSD license
+# @Release: $Revision: 1.2 $, under the BSD license
 # @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:d:c:hv --long \
+    mirror:,iso:,release:,target:,mntpoint:,debopt:,interactive,confdir:,config:,packages::,debconf::,keep_src_list,hostname:,password:,bootappend:,groot:,grub:,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
@@ -52,14 +55,17 @@ while :; do
   #
 
   # == Configuration options
-  --config|-c)         # Use specified configuration file, defaults to /etc/debootstr
+  --confdir|-d)        # Place of config files for debootstrap, defaults to /etc/debo
+    shift; _opt_confdir="$1"
+    ;;
+  --config|-c)         # Use specified configuration file, defaults to <confdir>/conf
     shift; _opt_config="$1"
     ;;
-  --packages)          # Install packages defined in /etc/debootstrap/packages. Optio
+  --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
     ;;