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

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 1274990..b82d2aa 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -1,58 +1,120 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Setting up init..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-boot header
+
+. /scripts/live-functions
+
+log_begin_msg "Setting up init"
+
+# live-boot script
 
 # Arrange for shells on virtual consoles, rather than login prompts
 
-if [ -n "$USERNAME" ]; then
-    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
-    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|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f) > /dev/$(basename $f) 2>\&1|" $f
-        done
-    fi
-fi
+USERNAME="user"
 
-# 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/etc/init.d/anacron ]; then
-    for f in /root/etc/rc?.d/S??anacron; do
-        mv ${f} ${f%/*}/K00anacron
-    done
+if [ -z "${NOAUTOLOGIN}" ] && [ -n "${USERNAME}" ]
+then
+	if [ ! -z "${LIVE_GETTY}" ]
+	then
+		if echo "${DEFCONSOLE}" | grep -qs ttyS
+		then
+			# AUTOMATIC SERIAL CONSOLE #
+			PORT=$(echo "${DEFCONSOLE}" | \
+				sed -e 's%,.*%%')
+			SPEED=$(echo "${DEFCONSOLE}" | \
+				sed -e 's%ttyS[0-9]\+,%%' \
+				-e's%\([0-9]\+\).*%\1%')
+
+			if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" )
+			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}
+				do
+					for ID2 in ${IDs}
+					do
+						ID="${ID1}${ID2}"
+
+						if ! grep "^${ID}:" /etc/inittab
+						then
+							#make sure it is not already in use
+							break 2
+						fi
+					done
+				done
+
+				echo "${ID}:2345:respawn:/sbin/live-getty -L ${PORT} ${SPEED} vt100" >> /root/etc/inittab
+			fi
+		fi
+
+		if [ -f /root/etc/inittab ]
+		then
+			sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/live-getty%' /root/etc/inittab
+		fi
+	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
+		fi
+
+		if [ "/root/etc/init/tty*" != "$(echo /root/etc/init/tty*)" ]
+		then
+			for f in /root/etc/init/tty*
+			do
+				sed -i -e "s|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f .conf) > /dev/$(basename $f .conf) 2>\&1|" $f
+			done
+		fi
+	fi
+
+	# Since we use autologin, lastlog doesn't make sense on the console.
+	sed -i '/^[^#].*pam_lastlog\.so/s/^/# /' /root/etc/pam.d/login
 fi
 
-# No point, really
-rm -f /root/etc/rc?.d/[SK]??postfix
+# do not try to remove files if using file-rc
+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 /root/usr/sbin/anacron
+	fi
 
-# Avoid clobbering the user's clock
-rm -f /root/etc/rc?.d/K??hwclock.sh
+	# Avoid clobbering the user's clock
+	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
 # use chmod instead of mv to not trigger unionfs bugs.
-if [ -e /root/sbin/readahead-list ]; then
-    chmod -x /root/sbin/readahead-list
+if [ -e /root/sbin/readahead-list ]
+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