From: Michael Prokop <mika@grml.org>
Date: Fri, 5 Jun 2015 08:43:50 +0000 (+0200)
Subject: Display error message if --vmfile and --grub are used in same cmdline
X-Git-Tag: v0.71~7
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=1e8339d1890dbcc25ef0e2b49b64ce9fa427f79b;hp=bfb0afbfbca607789a0d0fe786c258fb808a5158;ds=sidebyside

Display error message if --vmfile and --grub are used in same cmdline

This is an invalid and unneeded combination.

Fixes #84 @ github
---

diff --git a/grml-debootstrap b/grml-debootstrap
index 4615555..6e4182d 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -381,12 +381,6 @@ fi
 [ "$_opt_packages_set" ]        && PACKAGES='yes'
 [ "$_opt_nopackages" ]          && PACKAGES=''
 [ "$_opt_debconf_set" ]         && DEBCONF='yes'
-
-if [ "$_opt_scripts_set" ] ; then
-  ewarn "Deprecation NOTE: --scripts option is deprecated, please switch to --post-scripts instead."
-  SCRIPTS='yes' # deprecated since grml-debootstrap >=0.71
-fi
-
 [ "$_opt_post_scripts_set" ]    && POST_SCRIPTS='yes'
 [ "$_opt_pre_scripts_set" ]     && PRE_SCRIPTS='yes'
 [ "$_opt_chroot_scripts_set" ]  && CHROOT_SCRIPTS='yes'
@@ -413,6 +407,20 @@ fi
 [ "$_opt_contrib" ]             && COMPONENTS="$COMPONENTS contrib"
 [ "$_opt_non_free" ]            && COMPONENTS="$COMPONENTS non-free"
 
+# command line option checks
+if [ "$_opt_scripts_set" ] ; then
+  ewarn "Deprecation NOTE: --scripts option is deprecated, please switch to --post-scripts instead."
+  SCRIPTS='yes' # deprecated since grml-debootstrap >=0.71
+fi
+
+if [ "$_opt_grub" ] && [ "$_opt_vmfile" ] ; then
+  eerror "The --grub option is incompatible with --vmfile, please drop it from your command line."
+  eerror "The --grub option is unneeded as GRUB will be installed automatically."
+  eend 1
+  bailout 1
+fi
+
+
 if [ "$DEBUG" = "true" ] ; then
   set -x
 fi