summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-06-30 15:11:08 -0500
committerWilliam Hubbs <williamh@gentoo.org>2011-06-30 15:11:08 -0500
commit56aac9bfd8ed6d4b5e52d6fdc7a4edba57269d88 (patch)
treefb7c5e4bcb1d555f5f1035520fad03c94202b96a
parentremove bashlogin (diff)
downloadlivecd-tools-56aac9bfd8ed6d4b5e52d6fdc7a4edba57269d88.tar.gz
livecd-tools-56aac9bfd8ed6d4b5e52d6fdc7a4edba57269d88.tar.bz2
livecd-tools-56aac9bfd8ed6d4b5e52d6fdc7a4edba57269d88.zip
Revert "modify the fixinittab service to allow autologin on the consoles"
This reverts commit f5a0172d4c65049d5bb86c770d5cb52b324d77e3.
-rwxr-xr-xinit.d/fixinittab16
1 files changed, 8 insertions, 8 deletions
diff --git a/init.d/fixinittab b/init.d/fixinittab
index 2691d53..d355684 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -34,14 +34,14 @@ start()
if [ -c "/dev/ttyS0" ]
then
LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
- echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
+ echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
fi
# HPPA software PDC console (K-models)
if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
then
mknod /dev/ttyB0 c 11 0
LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
- echo "b0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
+ echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
fi
# FB / STI console
if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
@@ -51,19 +51,19 @@ start()
then
for x in 0 1 2 3 4 5 6
do
- echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
+ echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
done
else
for x in 1 2 3 4 5 6
do
- echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
+ echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
done
fi
fi
if [ -c "/dev/hvc0" ]
then
einfo "Adding hvc console to inittab"
- echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" 9600 hvc0 vt320" >> /etc/inittab
+ echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
fi
# The rest...
@@ -72,11 +72,11 @@ start()
then
for x in 1 2 3 4 5 6
do
- echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" 38400 tty${x} linux" >> /etc/inittab
+ echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
done
else
einfo "Adding ${LIVECD_CONSOLE} console to inittab"
- echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
+ echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
fi
fi
@@ -91,7 +91,7 @@ start()
*options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
*) speed=9600 ;; # choose a default, only matters if it is serial
esac
- echo "$id:12345:respawn:/sbin/agetty -l "/bin/login root" ${speed} ${line} vt100" >> /etc/inittab
+ echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
done
fi