X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F25configure_init;h=1152b4bad938ed7d1494dcd93ff85934abde75d2;hb=ccea277caf476cdfef4c0f953df5a97062d8be42;hp=b3f6ebf2855a9d91e9bdde54792a76f60d38f908;hpb=3d52fbcb4fe70132ade14759d76573b471294800;p=live-boot-grml.git

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index b3f6ebf..1152b4b 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -1,27 +1,36 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Setting up init..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Setting up init..."
+
+# live-initramfs script
 
 # Arrange for shells on virtual consoles, rather than login prompts
 
+if [ -z "${NOAUTOLOGIN}" ]
+then
+
 if [ -n "$USERNAME" ]; then
     if [ ! -z "${LIVE_GETTY}" ]; then
        if echo "${DEFCONSOLE}" | grep -qs ttyS; then
@@ -61,6 +70,8 @@ if [ -n "$USERNAME" ]; then
      fi
 fi
 
+fi
+
 # This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
 # /etc/crontab remaining disabled, yet also not run by anacron
 if [ -x /root/etc/init.d/anacron ]; then