X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F25configure_init;h=b82d2aab98b460f1db6a36e446e11c72684d618f;hb=2c3771deb1f69902c994861a5b6687acc8001a49;hp=67e21a65f7031f9b3c262f7f97abd685b7f7d055;hpb=f4a8f2b8c6982224fdb2505db0edf0669835d08f;p=live-boot-grml.git

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 67e21a6..b82d2aa 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -18,16 +18,18 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 . /scripts/live-functions
 
 log_begin_msg "Setting up init"
 
-# live-initramfs script
+# live-boot script
 
 # Arrange for shells on virtual consoles, rather than login prompts
 
+USERNAME="user"
+
 if [ -z "${NOAUTOLOGIN}" ] && [ -n "${USERNAME}" ]
 then
 	if [ ! -z "${LIVE_GETTY}" ]
@@ -98,7 +100,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
@@ -108,6 +110,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