Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/livecd-tools:master commit in: init.d/
Date: Thu, 30 Jun 2011 20:12:33
Message-Id: 56aac9bfd8ed6d4b5e52d6fdc7a4edba57269d88.WilliamH@gentoo
1 commit: 56aac9bfd8ed6d4b5e52d6fdc7a4edba57269d88
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 30 20:11:08 2011 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 20:11:08 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=56aac9bf
7
8 Revert "modify the fixinittab service to allow autologin on the consoles"
9
10 This reverts commit f5a0172d4c65049d5bb86c770d5cb52b324d77e3.
11
12 ---
13 init.d/fixinittab | 16 ++++++++--------
14 1 files changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/init.d/fixinittab b/init.d/fixinittab
17 index 2691d53..d355684 100755
18 --- a/init.d/fixinittab
19 +++ b/init.d/fixinittab
20 @@ -34,14 +34,14 @@ start()
21 if [ -c "/dev/ttyS0" ]
22 then
23 LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
24 - echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
25 + echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
26 fi
27 # HPPA software PDC console (K-models)
28 if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
29 then
30 mknod /dev/ttyB0 c 11 0
31 LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
32 - echo "b0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
33 + echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
34 fi
35 # FB / STI console
36 if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
37 @@ -51,19 +51,19 @@ start()
38 then
39 for x in 0 1 2 3 4 5 6
40 do
41 - echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
42 + echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
43 done
44 else
45 for x in 1 2 3 4 5 6
46 do
47 - echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
48 + echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
49 done
50 fi
51 fi
52 if [ -c "/dev/hvc0" ]
53 then
54 einfo "Adding hvc console to inittab"
55 - echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" 9600 hvc0 vt320" >> /etc/inittab
56 + echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
57 fi
58
59 # The rest...
60 @@ -72,11 +72,11 @@ start()
61 then
62 for x in 1 2 3 4 5 6
63 do
64 - echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" 38400 tty${x} linux" >> /etc/inittab
65 + echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
66 done
67 else
68 einfo "Adding ${LIVECD_CONSOLE} console to inittab"
69 - echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
70 + echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
71 fi
72 fi
73
74 @@ -91,7 +91,7 @@ start()
75 *options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
76 *) speed=9600 ;; # choose a default, only matters if it is serial
77 esac
78 - echo "$id:12345:respawn:/sbin/agetty -l "/bin/login root" ${speed} ${line} vt100" >> /etc/inittab
79 + echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
80 done
81 fi