Move remove_apt_cache behind stage extrapackages

[grml-debootstrap.git] / cmdlineopts.clp

diff --git a/cmdlineopts.clp b/cmdlineopts.clp
index b7d7a2a..5d259a5 100644 (file)
--- a/cmdlineopts.clp
+++ b/cmdlineopts.clp
@@ -1,5 +1,5 @@
 # -*- shell-script -*-
-# Filename:      grml-debootstrap.clp
+# Filename:      cmdlineopts.clp
 # Purpose:       shell script command line parameter-processing for grml-debootstrap
 # Authors:       grml-team (grml.org), Tong Sun <suntong@cpan.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -13,7 +13,7 @@
 ################################################################################
 
 _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::,chroot-scripts::,scripts::,debconf::,keep_src_list,hostname:,password:,bootappend:,groot:,grub:,verbose,help,version \
+    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 \
   -- "$@"`
 if [ $? != 0 ]; then
   eerror "Try 'grml-debootstrap --help' for more information."; eend 1; exit 1
@@ -30,7 +30,7 @@ while :; do
   --iso|-i)            # Mountpoint where a Debian ISO is mounted to
     shift; _opt_iso="$1"
     ;;
-  --release|-r)        # Release of new Debian system (default: stable)
+  --release|-r)        # Release of new Debian system
     shift; _opt_release="$1"
     ;;
   --target|-t)         # Target partition (/dev/...) or directory
@@ -39,7 +39,7 @@ while :; do
   --mntpoint|-p)       # Mountpoint used for mounting the target system
     shift; _opt_mntpoint="$1"
     ;;
-  --debopt)            # Extra parameters passed to the debootstrap
+  --debopt)            # Extra parameters passed to the debootstrap command
     shift; _opt_debopt="$1"
     ;;
   --interactive)       # Use interactive mode (frontend)
@@ -48,6 +48,12 @@ while :; do
   --nodebootstrap)     # Skip debootstrap, only do configuration to the target
     _opt_nodebootstrap=T
     ;;
+  --arch)              # Target architecutre
+    shift; _opt_arch="$1"
+    ;;
+  --insecure)
+    _opt_insecure=T
+    ;;
   #
 
   # == Configuration options
@@ -65,6 +71,10 @@ while :; do
     shift; _opt_debconf="$1"
     _opt_debconf_set=T
     ;;
+  --pre-scripts)       # Execute scripts from specified directory (before chroot-scripts).
+    shift; _opt_pre_scripts="$1"
+    _opt_pre_scripts_set=T
+    ;;
   --scripts)           # Execute scripts from specified directory
     shift; _opt_scripts="$1"
     _opt_scripts_set=T
@@ -85,9 +95,6 @@ while :; do
   --bootappend)        # Add specified appendline to kernel whilst booting
     shift; _opt_bootappend="$1"
     ;;
-  --groot)             # Root device for usage in grub, corresponds with $TARGET in grub
-    shift; _opt_groot="$1"
-    ;;
   --grub)              # Target for grub installation. Use grub syntax for specifying
     shift; _opt_grub="$1"
     ;;