From: Tong Sun <suntong@cpan.org>
Date: Fri, 17 Oct 2008 21:23:43 +0000 (-0400)
Subject: for Issue555
X-Git-Tag: v0.23~17^2~6
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=cd3d55ee26fe37bf59927e9b6526a5db329e72a0;hp=73f5513fb3a7327532a9bbc73e97560a5da1bd5f

for Issue555

added the '-d, --confdir=path' option:

Place of config files for debootstrap, defaults to /etc/debootstrap
---

diff --git a/grml-debootstrap b/grml-debootstrap
index 0805aef..809e9e4 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -49,13 +49,14 @@ Bootstrap options:
 Configuration options:
 
 
+  -d, --confdir=path     Place of config files for debootstrap, defaults to
+                           /etc/debootstrap
   -c, --config=file      Use specified configuration file, defaults to
-                           /etc/debootstrap/config
-      --packages[=f]     Install packages defined in /etc/debootstrap/packages.
-                           Option arg: alternative package list file.
-      --debconf[=f]      Pre-seed packages using
-                           /etc/debootstrap/debconf-selections. Option arg:
-                           alternative preseed db file.
+                           <confdir>/config
+      --packages[=f]     Install packages defined in <confdir>/packages. Option
+                           arg: alternative package list file.
+      --debconf[=f]      Pre-seed packages using <confdir>/debconf-selections.
+                           Option arg: alternative pre-seed db file.
       --keep_src_list    Do not overwrite user provided apt sources.list.
       --hostname=name    Hostname of Debian system.
       --password=pwd     Use specified password as password for user root.
@@ -103,6 +104,7 @@ fi
 # source external command line parameter-processing script
 . $prog_real.clp
 
+# business-logic of command line parameter-processing
 [ "$_opt_mirror" ]		&& MIRROR=$_opt_mirror
 [ "$_opt_iso" ]			&& ISO=$_opt_iso
 [ "$_opt_release" ]		&& RELEASE=$_opt_release
@@ -110,6 +112,7 @@ fi
 [ "$_opt_mntpoint" ]		&& MNTPOINT=$_opt_mntpoint
 [ "$_opt_debopt" ]		&& DEBOOTSTRAP_OPT=$_opt_debopt
 [ "$_opt_interactive" ]		&& INTERACTIVE=1
+[ "$_opt_confdir" ]		&& CONFFILES=$_opt_confdir
 [ "$_opt_config" ]		&& CONFIGFILE=$_opt_config
 [ "$_opt_packages_set" ]	&& PACKAGES='yes'
 [ "$_opt_debconf_set" ]		&& DEBCONF='yes'
diff --git a/grml-debootstrap.clp b/grml-debootstrap.clp
index 40063cb..4e43b4a 100644
--- a/grml-debootstrap.clp
+++ b/grml-debootstrap.clp
@@ -19,8 +19,8 @@
 
 
 
-_opt_temp=`getopt --name grml-debootstrap -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
@@ -55,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
     ;;