Adding upstream version 2.0~a5.

[live-boot-grml.git] / scripts / live-bottom / 25configure_init

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 67e21a6..b82d2aa 100755 (executable)
--- 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