X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=cmdlineopts.clp;h=1696d9c55f3d336374fa5038d6299bb34f7ba3fc;hp=6479dbcb7cfc70d068a289f21ebd20a4af7138f0;hb=02a476bff510c88e30d7e8a6ae5e3fbcde31599d;hpb=fc6d883482b5787110ef2d6b19918d4fbeb9d851

diff --git a/cmdlineopts.clp b/cmdlineopts.clp
index 6479dbc..1696d9c 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:,bootappend:,grub:,arch:,insecure,verbose,help,version
+CMDLINE_OPTS=mirror:,iso:,release:,target:,mntpoint:,debopt:,defaultinterfaces,interactive,nodebootstrap,nointerfaces,nokernel,nopackages,filesystem:,config:,confdir:,packages:,chroot-scripts:,scripts:,pre-scripts:,debconf:,vm,vmfile,vmsize:,keep_src_list,hostname:,password:,nopassword,grmlrepos,backportrepos,bootappend:,grub:,arch:,insecure,verbose,help,version,force,debug,contrib,non-free
 
 _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
@@ -65,6 +68,7 @@ while :; do
   --arch)              # Target architecutre
     shift; _opt_arch="$1"
     ;;
+  # just for backwards compatibility
   --insecure)
     _opt_insecure=T
     ;;
@@ -106,24 +110,54 @@ 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
+    ;;
+  --grmlrepos)         # Enable Grml repository
+    _opt_grmlrepos=T
+    ;;
+  --backportrepos)     # Enable Debian backports repository
+    _opt_backportrepos=T
+    ;;
   --bootappend)        # Add specified appendline to kernel whilst booting
     shift; _opt_bootappend="$1"
     ;;
   --grub)              # Target for grub installation. Use grub syntax for specifying
     shift; _opt_grub="$1"
     ;;
+  --contrib)           # Add 'contrib' to list of components
+    _opt_contrib=T
+    ;;
+  --non-free)          # Add 'non-free' to list of components
+    _opt_non_free=T
+    ;;
 
   # == Other options
   --verbose|-v)        # Increase verbosity
     if [ "$_opt_verbose" ]; then _opt_verbose=`expr $_opt_verbose + 1`
     else _opt_verbose=1; fi
     ;;
+  --debug)             # Execute in debug mode
+    _opt_debug=T
+    ;;
   --help|-h)           # Print usage information and exit
     _opt_help=T
     ;;
   --version|-V)        # Show version information and exit
     _opt_version=T
     ;;
+  --force)             # Do not prompt for user input
+    _opt_force=T
+    ;;
   --)
     shift; break
     ;;