X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F25configure_init;h=a84eb753d8e97b1a937293d9f6694f8bc30f6e9e;hb=3260fec82497dccb9633ef344dfa06d8dc718163;hp=bb06eb5ff5a92d7b3541b14017d53ef2dcd4dc32;hpb=7909d878be479e2ca2f177b42917e714d1b26b61;p=live-boot-grml.git

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index bb06eb5..a84eb75 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -18,13 +18,13 @@ 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
 
@@ -73,11 +73,11 @@ then
 			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*)" ]
+		if [ "/root/etc/init/tty*" != "$(echo /root/etc/init/tty*)" ]
 		then
-			for f in /root/etc/event.d/tty*
+			for f in /root/etc/init/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|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f .conf) > /dev/$(basename $f .conf) 2>\&1|" $f
 			done
 		fi
 	fi
@@ -87,21 +87,18 @@ then
 fi
 
 # do not try to remove files if using file-rc
-if [ -d /etc/rc0.d ]
+if [ -d /root/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/usr/sbin/anacron ]
 	then
 		chroot /root dpkg-divert --add --rename --quiet /usr/sbin/anacron
-		ln -s /bin/true /usr/sbin/anacron
+		ln -s /bin/true /root/usr/sbin/anacron
 	fi
 
-	# No point, really
-	rm -f /root/etc/rc?.d/[SK]??postfix
-
 	# 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
@@ -111,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