From: Michael Prokop Date: Mon, 22 Feb 2010 22:25:17 +0000 (+0100) Subject: Revert "Updated grml-debootstrap parameter handling" X-Git-Tag: v0.34~6 X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=7cc268e168259a681c0244f9d73a28b7dc4d3769 Revert "Updated grml-debootstrap parameter handling" This reverts commit 190788f7894ad368ea24d27b8acc2cef7db692d4. --- diff --git a/cmdlineopts.clp b/cmdlineopts.clp index cefb76f..dd88afb 100644 --- a/cmdlineopts.clp +++ b/cmdlineopts.clp @@ -12,7 +12,7 @@ # should be handled in the main script, where it belongs. ################################################################################ -CMDLINE_OPTS=mirror:,iso:,release:,target:,mntpoint:,debopt:,interactive,nodebootstrap,config:,confdir:,packages::,chroot-scripts:,scripts::,pre-scripts::,debconf::,keep_src_list,hostname:,password:,bootappend:,grub:,arch:,insecure,verbose,help,version +CMDLINE_OPTS=mirror:,iso:,release:,target:,mntpoint:,debopt:,interactive,nodebootstrap,config:,confdir:,packages:,chroot-scripts:,scripts:,pre-scripts:,debconf:,keep_src_list,hostname:,password:,bootappend:,grub:,arch:,insecure,verbose,help,version _opt_temp=`getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:vhV --long \ $CMDLINE_OPTS -- "$@"` diff --git a/config b/config index b748cf2..bd75618 100644 --- a/config +++ b/config @@ -113,10 +113,10 @@ DEBIAN_FRONTEND='noninteractive' # STAGES='/var/cache/grml-debootstrap' # install packages defined in /etc/debootstrap/packages? -PACKAGES= +PACKAGES='yes' # pre-seed packages using /etc/debootstrap/debconf-selections (if exist)? -DEBCONF= +DEBCONF='yes' # execute scripts from /etc/debootstrap/chroot-scripts/ inside the chroot? CHROOT_SCRIPTS='yes' diff --git a/grml-debootstrap b/grml-debootstrap index 1e6f49c..2e386bf 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -57,15 +57,15 @@ Configuration options: /etc/debootstrap/config -d, --confdir Place of config files for debootstrap, defaults to /etc/debootstrap - --packages[=] Install packages defined in specified list file. - --debconf[=] Pre-seed packages using specified pre-seed db file. + --packages Install packages defined in specified list file. + --debconf Pre-seed packages using specified pre-seed db file. --keep_src_list Do not overwrite user provided apt sources.list. --hostname Hostname of Debian system. --password Use specified password as password for user root. --bootappend Add specified appendline to kernel whilst booting. --chroot-scripts Execute chroot scripts from specified directory. - --pre-scripts[=] Execute scripts from specified directory (before chroot-scripts). - --scripts[=] Execute scripts from specified directory (after chroot-scripts). + --pre-scripts Execute scripts from specified directory (before chroot-scripts). + --scripts Execute scripts from specified directory (after chroot-scripts). Other options: diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index a12054a..b9e0349 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -56,12 +56,10 @@ Options and environment variables Place of configuration files for debootstrap, defaults to /etc/debootstrap. -*--debconf*[=<_file_>]:: +*--debconf* <_file_>:: - When using *--debconf* without the optional '=<_file_>' parameter, it - enables preseeding Debian packages using the default - '/debconf-selections' file. If the optional parameter is given, - use the specified file for preseeding Debian packages instead. + Use specified file for preseeding Debian packages instead of using + the default /debconf-selections. *--debopt* <_params_>:: @@ -116,13 +114,10 @@ Options and environment variables Note: this option has no effect if option -t is given and represents a directory. -*--packages*[=<_file_>]:: +*--packages* <_file_>:: - When using *--packages* without the optional '=<_file_>' parameter, it - enables installing the packages defined in the default package list - '/packages' file. If the optional parameter is given, the - specified list file is used as list for packages that should be - installed instead. + Use specified file as list for packages that should be installed instead of + the default package list file /packages. *--password* <_password_>:: @@ -136,25 +131,20 @@ Options and environment variables squeeze (note: requires current version of debootstrap) and sid. Corresponding with configuration variable RELEASE. -*--pre-scripts*[=<_directory_>]:: +*--pre-scripts* <_directory_>:: - When using *--pre-scripts* without the optional '=<_directory_>' - parameter, it enables executing scripts from the default - '/pre-scripts/' directory before executing the chroot script. - If the optional parameter is given, execute scripts from the specified - directory instead. This allows customization of the system before the - chroot has been set up. The environment variable $MNTPOINT is available - inside the scripts for direct access of the chroot. + Execute scripts from specified directory before executing the chroot + script. This allows customisation of the system before the chroot has + been set up. The environment variable $MNTPOINT is available inside the + scripts for direct access of the chroot. + Default directory: /etc/debootstrap/pre-scripts/ -*--scripts*[=<_directory_>]:: +*--scripts* <_directory_>:: - When using *--scripts* without the optional '=<_directory_>' parameter, - it enables executing scripts from the default '/scripts/' - directory after the chroot has been set up. If the optional parameter is - given, execute scripts from the specified directory instead. This allows - customisation of the system after the chroot has been set up. The - environment variable $MNTPOINT is available inside the scripts for - direct access of the chroot. + Execute scripts from specified directory. This allows customisation of + the system after the chroot has been set up. The environment variable + $MNTPOINT is available inside the scripts for direct access of the chroot. + Default directory: /etc/debootstrap/scripts/ *-t*, *--target* <_target_>:: Target partition (/dev/...) or directory (anything else without /dev at the @@ -168,21 +158,9 @@ Options and environment variables *-V*, *--version*:: Show version of program and exit. -TIP: The long options may be abbreviated, as long as the abbreviation is not -ambiguous. Eg. '--k' will be the same as '--keep_src_list', and '--pac' be -'--packages'. - -[WARNING] -===================================================================== - -- To specify the optional parameter for switches that accept them, the -optional argument must be written directly after the long option name, -separated by `=' (without space). - -- the commandline parsing of grml-debootstrap does not validate the provided +WARNING: the commandline parsing of grml-debootstrap does not validate the provided arguments for the commandline options. Please be careful and check docs and /etc/debootstrap/config for further information. -===================================================================== Usage examples ---------------