X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=cmdlineopts.clp;h=68b241aaf557dbcaee7933d0dfdf6d37b715c815;hp=fd773e8bdf45d85be47ad8133f05d594ec2a7938;hb=10ad4699c352b3537625085370051b9be83d2036;hpb=8b1c652b800232a1ec82272e9802f1a252cf0f36

diff --git a/cmdlineopts.clp b/cmdlineopts.clp
index fd773e8..68b241a 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,nopackages,filesystem:,config:,confdir:,packages:,chroot-scripts:,scripts:,pre-scripts:,debconf:,vmfile,vmsize:,keep_src_list,hostname:,password:,nopassword,grmlrepos,backportrepos,bootappend:,grub:,arch:,insecure,verbose,help,version,force,debug
+CMDLINE_OPTS=mirror:,iso:,release:,target:,mntpoint:,debopt:,defaultinterfaces,interactive,nodebootstrap,nointerfaces,nokernel,nopackages,filesystem:,config:,confdir:,packages:,chroot-scripts:,scripts:,post-scripts:,pre-scripts:,debconf:,vm,vmfile,vmsize:,keep_src_list,hostname:,password:,nopassword,grmlrepos,backportrepos,bootappend:,grub:,efi:,arch:,insecure,verbose,help,version,force,debug,contrib,non-free,remove-configs
 
 _opt_temp=`getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:vhV --long \
     $CMDLINE_OPTS -- "$@"`
@@ -38,10 +38,13 @@ while :; do
   --target|-t)         # Target partition (/dev/...) or directory
     shift; _opt_target="$1"
     ;;
-  --vmfile)           # Virtual machine file
+  --vm)                # Virtual machine image (no file)
+    _opt_vm="T"
+    ;;
+  --vmfile)            # Virtual machine file
     _opt_vmfile="T"
     ;;
-  --vmsize)           # size of Virtual machine file
+  --vmsize)            # size of Virtual machine file
     shift; _opt_vmsize="$1"
     ;;
   --mntpoint|-p)       # Mountpoint used for mounting the target system
@@ -90,10 +93,14 @@ while :; do
     shift; _opt_pre_scripts="$1"
     _opt_pre_scripts_set=T
     ;;
-  --scripts)           # Execute scripts from specified directory
+  --scripts)           # Execute scripts from specified directory [NOTE: deprecated, replaced via --post-scripts]
     shift; _opt_scripts="$1"
     _opt_scripts_set=T
     ;;
+  --post-scripts)       # Execute scripts from specified directory
+    shift; _opt_post_scripts="$1"
+    _opt_post_scripts_set=T
+    ;;
   --chroot-scripts)   # Execute chroot scripts from specified directory
     shift; _opt_chroot_scripts="$1"
     _opt_chroot_scripts_set=T
@@ -107,6 +114,15 @@ while :; do
   --password)          # Use specified password as password for user root
     shift; _opt_password="$1"
     ;;
+  --defaultinterfaces) # Install default /etc/network/interfaces
+    _opt_defaultinterfaces=T
+    ;;
+  --nointerfaces)      # Skip installation of /etc/network/interfaces
+    _opt_nointerfaces=T
+    ;;
+  --nokernel)          # Skip installation of default kernel images
+    _opt_nokernel=T
+    ;;
   --nopassword)        # Skip password dialog
     _opt_nopassword=T
     ;;
@@ -122,6 +138,18 @@ while :; do
   --grub)              # Target for grub installation. Use grub syntax for specifying
     shift; _opt_grub="$1"
     ;;
+  --efi)               # Target for EFI boot installation
+    shift; _opt_efi="$1"
+    ;;
+  --contrib)           # Add 'contrib' to list of components
+    _opt_contrib=T
+    ;;
+  --non-free)          # Add 'non-free' to list of components
+    _opt_non_free=T
+    ;;
+  --remove-configs)    # Drop config files from installed system
+    _opt_remove_configs=T
+    ;;
 
   # == Other options
   --verbose|-v)        # Increase verbosity
@@ -129,7 +157,7 @@ while :; do
     else _opt_verbose=1; fi
     ;;
   --debug)             # Execute in debug mode
-    _opt_debug==T
+    _opt_debug=T
     ;;
   --help|-h)           # Print usage information and exit
     _opt_help=T