Re-think the confdir logic

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

diff --git a/grml-debootstrap.clp b/grml-debootstrap.clp
index 4e43b4a..2038db8 100644 (file)
--- a/grml-debootstrap.clp
+++ b/grml-debootstrap.clp
@@ -19,11 +19,11 @@
 
 
 
-_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 \
+_opt_temp=`getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:hv --long \
+    mirror:,iso:,release:,target:,mntpoint:,debopt:,interactive,config:,confdir:,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
+  eerror "Try 'grml-debootstrap --help' for more information."; eend 1; exit 1
 fi
 eval set -- "$_opt_temp"
 
@@ -55,12 +55,12 @@ while :; do
   #
 
   # == Configuration options
+  --config|-c)         # Use specified configuration file, defaults to /etc/debootstr
+    shift; _opt_config="$1"
+    ;;
   --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 <confdir>/packages. Option arg:
     shift; _opt_packages="$1"
     _opt_packages_set=T