Merging casper 1.195.

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

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 3a7633f..b90a7db 100755 (executable)
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -73,11 +73,12 @@ 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 "/^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}
                        done
                fi
        fi
@@ -97,9 +98,6 @@ then
                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
 fi