Support and enable per default --keyring option. [Closes: issue746]

[grml-debootstrap.git] / cmdlineopts.clp

diff --git a/cmdlineopts.clp b/cmdlineopts.clp
index a513314..cdb6640 100644 (file)
--- a/cmdlineopts.clp
+++ b/cmdlineopts.clp
@@ -13,7 +13,7 @@
 ################################################################################
 
 _opt_temp=`getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:vhV --long \
 ################################################################################
 
 _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::,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
   -- "$@"`
 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"
     ;;
   --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
     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"
     ;;
   --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)
     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
     ;;
   --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
   #
 
   # == Configuration options


@@ -70,7 +76,7 @@ while :; do
     _opt_scripts_set=T
     ;;
   --chroot-scripts)   # Execute chroot scripts from specified directory
     _opt_scripts_set=T
     ;;
   --chroot-scripts)   # Execute chroot scripts from specified directory

-    shift; _opt_chroot_scripts_set="$1"
+    shift; _opt_chroot_scripts="$1"

     _opt_chroot_scripts_set=T
     ;;
   --keep_src_list)     # Do not overwrite user provided apt sources.list
     _opt_chroot_scripts_set=T
     ;;
   --keep_src_list)     # Do not overwrite user provided apt sources.list


@@ -85,9 +91,6 @@ while :; do
   --bootappend)        # Add specified appendline to kernel whilst booting
     shift; _opt_bootappend="$1"
     ;;
   --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"
     ;;
   --grub)              # Target for grub installation. Use grub syntax for specifying
     shift; _opt_grub="$1"
     ;;