X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F25configure_init;h=bec56087b6b880499106aa5ef12a78f3f2039b59;hb=1e0a488b895cd6e2bf7141aa730f17da42a490f7;hp=1ed4445a50f168e0da12e61add2330ff61e4aa9d;hpb=cb896241d0ec8eb2bba0cecd11de3500869176a6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 1ed4445..bec5608 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -30,7 +30,7 @@ log_begin_msg "Setting up init..."
 
 if [ -z "${NOAUTOLOGIN}" ]
 then
-	if [ -n "$USERNAME" ]
+	if [ -n "${USERNAME}" ]
 	then
 		if [ ! -z "${LIVE_GETTY}" ]
 		then
@@ -47,9 +47,9 @@ then
 				then
 					IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9"
 
-					for ID1 in $IDs
+					for ID1 in ${IDs}
 					do
-						for ID2 in $IDs
+						for ID2 in ${IDs}
 						do
 							ID="${ID1}${ID2}"
 
@@ -72,25 +72,28 @@ then
 		else
 			if [ -f /root/etc/inittab ]
 			then
-				sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
+				sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f ${USERNAME} </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
 			fi
 
 			if [ "/root/etc/event.d/tty*" != "$(echo /root/etc/event.d/tty*)" ]
 			then
 				for f in /root/etc/event.d/tty*
 				do
-					sed -i -e "s|^respawn.*|respawn /bin/login -f $USERNAME </dev/$(basename $f) > /dev/$(basename $f) 2>\&1|" $f
+					sed -i -e "s|^respawn.*|respawn /bin/login -f ${USERNAME} </dev/$(basename ${f}) > /dev/$(basename ${f}) 2>\&1|" ${f}
 				done
 
 				if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
 				then
 					for x in $(cat /proc/cmdline)
 					do
-						case $x in
+						case ${x} in
 							noninteractive)
 								sed -i -e "s|^exec.*|exec /usr/bin/ubiquity noninteractive </dev/tty1 > /dev/tty1 2>\&1|" /root/etc/event.d/tty1
-								rm -f /root/etc/rc?.d/[SK]??gdm
-								rm -f /root/etc/rc?.d/[SK]??kdm
+								rm -f /root/etc/rc?.d/[SK]??[gkx]dm
+								;;
+
+							textonly)
+								rm -f /root/etc/rc?.d/[SK]??[gkx]dm
 								;;
 						esac
 					done
@@ -108,12 +111,10 @@ if [ -d /etc/rc0.d ]
 then
 	# 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 ]
+	if [ -x /root/usr/sbin/anacron ]
 	then
-		for f in /root/etc/rc?.d/S??anacron
-		do
-			mv ${f} ${f%/*}/K00anacron
-		done
+		chroot /root dpkg-divert --add --rename --quiet /usr/sbin/anacron
+		ln -s /bin/true /usr/sbin/anacron
 	fi
 
 	# No point, really