From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-358029-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QbQhY-0002Aq-Pc
for garchives@archives.gentoo.org; Tue, 28 Jun 2011 05:19:09 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E1E701C012;
Tue, 28 Jun 2011 05:18:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id A14DB1C012
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jun 2011 05:18:55 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 22E451B403F
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jun 2011 05:18:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 434BF8003C
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jun 2011 05:18:54 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <229c96920e4bc4a3d793d260b79c9c4382ca7af1.WilliamH@gentoo>
Subject: [gentoo-commits] proj/livecd-tools:master commit in: init.d/
X-VCS-Repository: proj/livecd-tools
X-VCS-Files: init.d/fixinittab
X-VCS-Directories: init.d/
X-VCS-Committer: WilliamH
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 229c96920e4bc4a3d793d260b79c9c4382ca7af1
Date: Tue, 28 Jun 2011 05:18:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 34d727b562b80ba720d44fd648664129
commit: 229c96920e4bc4a3d793d260b79c9c4382ca7af1
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 05:17:28 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 05:17:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/livecd-tools.=
git;a=3Dcommit;h=3D229c9692
Revert "modify the fixinittab service to allow autologin on the consoles"
This reverts commit f8014344d03a553418b3f5153c3c3cebc2ca131b.
---
init.d/fixinittab | 16 ++++++++--------
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=3D$(stty -F /dev/ttyS0 speed)
- echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CON=
SOLE_BAUD} ttyS0 vt100" >> /etc/inittab
+ echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSO=
LE_BAUD} ttyS0 vt100" >> /etc/inittab
fi
# HPPA software PDC console (K-models)
if [ "${LIVECD_CONSOLE}" =3D "ttyB0" ]
then
mknod /dev/ttyB0 c 11 0
LIVECD_CONSOLE_BAUD=3D$(stty -F /dev/ttyB0 speed)
- echo "b0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CON=
SOLE_BAUD} ttyB0 vt100" >> /etc/inittab
+ echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSO=
LE_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 r=
oot 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 r=
oot 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 vt=
320" >> /etc/inittab
+ echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt32=
0" >> /etc/inittab
fi
=20
# 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 tt=
y${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_CON=
SOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
+ echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSO=
LE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
fi
fi
=20
@@ -91,7 +91,7 @@ start()
*options\ \'[0-9]*) speed=3D`echo "$x" | sed "s/.*options '//; s/[^0=
-9].*//"` ;;
*) speed=3D9600 ;; # 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} ${li=
ne} vt100" >> /etc/inittab
done
fi
=20