X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F25configure_init;h=c06617f0dfa100187156b9646bd1e352aa0e89f6;hb=29c5edc37612c351083a5a2fbe034dbeb31dfb55;hp=b90a7db1e1dbbf5177cfb792b1536a24a9aca7db;hpb=58ca66342e48713c51d0390f754c2d186561681f;p=live-boot-grml.git

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index b90a7db..c06617f 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -77,8 +77,7 @@ then
 		then
 			for f in /root/etc/init/tty*
 			do
-				sed -i -e "/^respawn$/!s|^respawn.*|respawn /bin/login -f ${USERNAME} </dev/$(basename ${f}) > /dev/$(basename ${f}) 2>\&1|" ${f}
-				sed -i -e "s|^exec.*|exec /bin/login -f ${USERNAME} </dev/$(basename ${f}) > /dev/$(basename ${f}) 2>\&1|" ${f}
+				sed -i -e "s|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f .conf) > /dev/$(basename $f .conf) 2>\&1|" $f
 			done
 		fi
 	fi
@@ -99,7 +98,7 @@ then
 	fi
 
 	# Avoid clobbering the user's clock
-	rm -f /root/etc/rc?.d/K??hwclock.sh
+	rm -f /root/etc/rc?.d/K??hwclock.sh /root/etc/init/hwclock-save.conf
 fi
 
 # Disable readahead since it doesn't play well with squashfs + unionfs
@@ -109,6 +108,11 @@ then
 	chmod -x /root/sbin/readahead-list
 fi
 
+# Disable ureadahead too since we don't ship a pack file for it anyway, so
+# all we'll end up doing is profiling the live CD boot. ureadahead also
+# breaks partman occasionally by reading from its synchronisation FIFOs.
+rm -f /root/etc/init/ureadahead.conf
+
 log_end_msg
 
 exit 0