From: Michael Prokop <mika@grml.org>
Date: Mon, 16 Apr 2007 18:08:22 +0000 (+0200)
Subject: Improve look and feel inside config_debootstrap()
X-Git-Tag: 0.6.37
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=a0c06e1b38ea1ac1ab18ec8dfe080ef527da25be

Improve look and feel inside config_debootstrap()
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 11dd166..4a9238a 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -2153,9 +2153,10 @@ if stringinstring "BOOT_IMAGE=debian2hd " "$CMDLINE" ; then
 einfo "Bootoption debian2hd found. Setting up environment for automatic installation via grml-debootstrap." ; eend 0
 
 if ! [ -x /usr/sbin/grml-debootstrap ] ; then
+   eindent
    eerror "Bootoption debian2hd found, but grml-debootstrap is not available." ; eend 1
-   eerror "Dropping you to a shell, just exit it to continue booting." ; eend 1
-   /bin/zsh
+   eoutdent
+   exit 1
 fi
 
 if checkbootparam "partition" ; then
@@ -2167,8 +2168,10 @@ if checkbootparam "partition" ; then
      eerror "Partition $PARTITION does not exist. Skipping execution of grml-debootstrap therefore." ; eend 1
   fi
 else
+  eindent
   eerror "No bootoption partition found, can not continue execution of grml-debootstrap." ; eend 1
-  exit 0
+  eoutdent
+  exit 1
 fi
 
 if checkbootparam "grub" ; then