X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F25configure_init;h=3c2f7653a7a309fe33292b85ed02f015604dd517;hb=cf052ec1816745240c65745a0de6cc4dce8c8433;hp=e30261a993a634b39623aa393afa8d5ed573d3c8;hpb=6a3e789117d7c4254aee7905e0c3065a5202d79f;p=live-boot-grml.git

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index e30261a..3c2f765 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -22,7 +22,7 @@ esac
 
 . /scripts/live-functions
 
-log_begin_msg "Setting up init..."
+log_begin_msg "Setting up init"
 
 # live-initramfs script
 
@@ -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,29 +72,15 @@ 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
-							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
-								;;
-						esac
-					done
-				fi
 			fi
 		fi