From: Michael Prokop <mika@grml.org>
Date: Mon, 30 May 2011 21:05:19 +0000 (+0200)
Subject: Support --force option to skip user acknowledgement and do not prompt for user input.
X-Git-Tag: v0.46~3
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=a64fecc43d38fc8ec220490b772c0c2f2ec7a86d

Support --force option to skip user acknowledgement and do not prompt for user input.
---

diff --git a/cmdlineopts.clp b/cmdlineopts.clp
index 6479dbc..880b50d 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:,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,force
 
 _opt_temp=`getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:vhV --long \
     $CMDLINE_OPTS -- "$@"`
@@ -124,6 +124,9 @@ while :; do
   --version|-V)        # Show version information and exit
     _opt_version=T
     ;;
+  --force)             # Do not prompt for user input
+    _opt_force=T
+    ;;
   --)
     shift; break
     ;;
diff --git a/grml-debootstrap b/grml-debootstrap
index 111e8e8..b030ff0 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -17,6 +17,7 @@ MNTPOINT="/mnt/debootstrap.$$"
 
 # defaults
 VMSIZE="2G"
+FORCE=''
 
 # inside the chroot system locales might not be available, so use minimum:
 export LANG=C
@@ -56,6 +57,7 @@ Bootstrap options:
       --filesystem <fs>  Filesystem that should be used when target is a partition
                          or Virtual Machine (see --vmfile).
       --insecure         Do not download and check Release file signatures.
+      --force            Do not prompt for user acknowledgement.
 
 Options for Virtual Machine deployment:
 
@@ -163,6 +165,7 @@ fi
 [ "$_opt_grub" ]                && GRUB=$_opt_grub
 [ "$_opt_arch" ]                && ARCH=$_opt_arch
 [ "$_opt_insecure" ]            && SECURE='false'
+[ "$_opt_force" ]               && FORCE=$_opt_force
 [ "$_opt_verbose" ]             && VERBOSE="-v"
 
 [ "$_opt_help" ] && {
@@ -550,12 +553,16 @@ else # if not running automatic installation display configuration and prompt fo
    echo
    echo "   Important! Continuing will delete all data from ${TARGET}!"
 
-   echo
-   einfon "Is this ok for you? [y/N] "
-   read a
-   if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
-      eerror "Exiting as requested." ; eend 1
-      exit 1
+   if [ -n "$FORCE" ] ; then
+     einfo "Skip user acknowledgement as requested via --force option."
+   else
+     echo
+     einfon "Is this ok for you? [y/N] "
+     read a
+     if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
+        eerror "Exiting as requested." ; eend 1
+        exit 1
+     fi
    fi
 fi
 }
diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index 3144ebe..a18ad84 100644
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -71,6 +71,10 @@ Options and environment variables
     If unset defaults to ext3. Valid values are all filesystems that
     can be created through mkfs.<filesystem>.
 
+*--force*::
+
+    Skip user acknowledgement and do not prompt for user input.
+
 *--grub* <_device_>::
 
     Device where grub should be installed to. Note that only the MBR (master