Current state

diff --git a/.etckeeper b/.etckeeper
index 49f4d31a91c042846e8b9509b706653775528e99..6b2034e7853a8ffff2f34105721c9a64329f0f3c 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -246,6 +246,7 @@ maybe chmod 0755 'config-archive/etc/init.d/urandom'
 maybe chmod 0755 'config-archive/etc/init.d/urandom.dist'
 maybe chmod 0644 'config-archive/etc/inittab'
 maybe chmod 0644 'config-archive/etc/inittab.1'
+maybe chmod 0644 'config-archive/etc/inittab.2'
 maybe chmod 0644 'config-archive/etc/inittab.dist'
 maybe chmod 0755 'config-archive/etc/layman'
 maybe chmod 0644 'config-archive/etc/layman/layman.cfg'

diff --git a/config-archive/etc/inittab b/config-archive/etc/inittab
index ad7317fa23af24dfee819df5b67e45d4bb068d98..ab61c6308b38631604bc8164bdd685a3300232fb 100644 (file)
--- a/config-archive/etc/inittab
+++ b/config-archive/etc/inittab
@@ -9,7 +9,7 @@
 # Modified by:  Mike Frysinger, <vapier@gentoo.org>
 # Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $
 
 # Default runlevel.
 id:3:initdefault:
@@ -44,8 +44,8 @@ c5:2345:respawn:/sbin/agetty 38400 tty5 linux
 c6:2345:respawn:/sbin/agetty 38400 tty6 linux
 
 # SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty 115200 ttyS1 vt100
+#s0:12345:respawn:/sbin/agetty -L 115200 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty -L 115200 ttyS1 vt100
 
 # What to do at the "Three Finger Salute".
 ca:12345:ctrlaltdel:/sbin/shutdown -r now
@@ -56,4 +56,3 @@ ca:12345:ctrlaltdel:/sbin/shutdown -r now
 # extra at boot if /etc/init.d/xdm is not added
 # to the "default" runlevel.
 x:a:once:/etc/X11/startDM.sh
-

diff --git a/config-archive/etc/inittab.1 b/config-archive/etc/inittab.1
index fe9bd62df2017343b095c5709f60053347043a21..ad7317fa23af24dfee819df5b67e45d4bb068d98 100644 (file)
--- a/config-archive/etc/inittab.1
+++ b/config-archive/etc/inittab.1
@@ -44,8 +44,8 @@ c5:2345:respawn:/sbin/agetty 38400 tty5 linux
 c6:2345:respawn:/sbin/agetty 38400 tty6 linux
 
 # SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100
+#s0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty 115200 ttyS1 vt100
 
 # What to do at the "Three Finger Salute".
 ca:12345:ctrlaltdel:/sbin/shutdown -r now

diff --git a/config-archive/etc/inittab.2 b/config-archive/etc/inittab.2
new file mode 100644 (file)
index 0000000..fe9bd62
--- /dev/null
+++ b/config-archive/etc/inittab.2
@@ -0,0 +1,59 @@
+#
+# /etc/inittab:  This file describes how the INIT process should set up
+#                the system in a certain run-level.
+#
+# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
+# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
+# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
+# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
+# Modified by:  Mike Frysinger, <vapier@gentoo.org>
+# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
+#
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $
+
+# Default runlevel.
+id:3:initdefault:
+
+# System initialization, mount local filesystems, etc.
+si::sysinit:/sbin/rc sysinit
+
+# Further system initialization, brings up the boot runlevel.
+rc::bootwait:/sbin/rc boot
+
+l0:0:wait:/sbin/rc shutdown 
+l0s:0:wait:/sbin/halt -dhp
+l1:1:wait:/sbin/rc single
+l2:2:wait:/sbin/rc nonetwork
+l3:3:wait:/sbin/rc default
+l4:4:wait:/sbin/rc default
+l5:5:wait:/sbin/rc default
+l6:6:wait:/sbin/rc reboot
+l6r:6:wait:/sbin/reboot -dk
+#z6:6:respawn:/sbin/sulogin
+
+# new-style single-user
+su0:S:wait:/sbin/rc single
+su1:S:wait:/sbin/sulogin
+
+# TERMINALS
+c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux
+c2:2345:respawn:/sbin/agetty 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty 38400 tty3 linux
+c4:2345:respawn:/sbin/agetty 38400 tty4 linux
+c5:2345:respawn:/sbin/agetty 38400 tty5 linux
+c6:2345:respawn:/sbin/agetty 38400 tty6 linux
+
+# SERIAL CONSOLES
+#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100
+
+# What to do at the "Three Finger Salute".
+ca:12345:ctrlaltdel:/sbin/shutdown -r now
+
+# Used by /etc/init.d/xdm to control DM startup.
+# Read the comments in /etc/init.d/xdm for more
+# info. Do NOT remove, as this will start nothing
+# extra at boot if /etc/init.d/xdm is not added
+# to the "default" runlevel.
+x:a:once:/etc/X11/startDM.sh
+

diff --git a/config-archive/etc/inittab.dist b/config-archive/etc/inittab.dist
index aa588b6a284693a55a43e51133703ae1f5c2b401..689bbc474cdd406c04ac44422c15df1dcd26a2fd 100644 (file)
--- a/config-archive/etc/inittab.dist
+++ b/config-archive/etc/inittab.dist
@@ -8,34 +8,36 @@
 # Modified by:  Martin Schlemmer, <azarah@gentoo.org>
 # Modified by:  Mike Frysinger, <vapier@gentoo.org>
 # Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
+# Modified by:  William Hubbs, <williamh@gentoo.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $
+# $Id$
 
 # Default runlevel.
 id:3:initdefault:
 
 # System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/rc sysinit
+si::sysinit:/sbin/openrc sysinit
 
 # Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/rc boot
-
-l0:0:wait:/sbin/rc shutdown 
-l0s:0:wait:/sbin/halt -dhp
-l1:1:wait:/sbin/rc single
-l2:2:wait:/sbin/rc nonetwork
-l3:3:wait:/sbin/rc default
-l4:4:wait:/sbin/rc default
-l5:5:wait:/sbin/rc default
-l6:6:wait:/sbin/rc reboot
-l6r:6:wait:/sbin/reboot -dk
+rc::bootwait:/sbin/openrc boot
+
+l0:0:wait:/sbin/openrc shutdown 
+l0s:0:wait:/sbin/halt -dhnp
+l1:1:wait:/sbin/openrc single
+l2:2:wait:/sbin/openrc nonetwork
+l3:3:wait:/sbin/openrc default
+l4:4:wait:/sbin/openrc default
+l5:5:wait:/sbin/openrc default
+l6:6:wait:/sbin/openrc reboot
+l6r:6:wait:/sbin/reboot -dkn
 #z6:6:respawn:/sbin/sulogin
 
 # new-style single-user
-su0:S:wait:/sbin/rc single
+su0:S:wait:/sbin/openrc single
 su1:S:wait:/sbin/sulogin
 
 # TERMINALS
+#x1:12345:respawn:/sbin/agetty 38400 console linux
 c1:12345:respawn:/sbin/agetty 38400 tty1 linux
 c2:2345:respawn:/sbin/agetty 38400 tty2 linux
 c3:2345:respawn:/sbin/agetty 38400 tty3 linux

diff --git a/inittab b/inittab
index ab61c6308b38631604bc8164bdd685a3300232fb..4ccffc801fa671db5d4bc8d5cb0f48cd634e6109 100644 (file)
--- a/inittab
+++ b/inittab
@@ -8,34 +8,36 @@
 # Modified by:  Martin Schlemmer, <azarah@gentoo.org>
 # Modified by:  Mike Frysinger, <vapier@gentoo.org>
 # Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
+# Modified by:  William Hubbs, <williamh@gentoo.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $
+# $Id$
 
 # Default runlevel.
 id:3:initdefault:
 
 # System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/rc sysinit
+si::sysinit:/sbin/openrc sysinit
 
 # Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/rc boot
-
-l0:0:wait:/sbin/rc shutdown 
-l0s:0:wait:/sbin/halt -dhp
-l1:1:wait:/sbin/rc single
-l2:2:wait:/sbin/rc nonetwork
-l3:3:wait:/sbin/rc default
-l4:4:wait:/sbin/rc default
-l5:5:wait:/sbin/rc default
-l6:6:wait:/sbin/rc reboot
-l6r:6:wait:/sbin/reboot -dk
+rc::bootwait:/sbin/openrc boot
+
+l0:0:wait:/sbin/openrc shutdown 
+l0s:0:wait:/sbin/halt -dhnp
+l1:1:wait:/sbin/openrc single
+l2:2:wait:/sbin/openrc nonetwork
+l3:3:wait:/sbin/openrc default
+l4:4:wait:/sbin/openrc default
+l5:5:wait:/sbin/openrc default
+l6:6:wait:/sbin/openrc reboot
+l6r:6:wait:/sbin/reboot -dkn
 #z6:6:respawn:/sbin/sulogin
 
 # new-style single-user
-su0:S:wait:/sbin/rc single
+su0:S:wait:/sbin/openrc single
 su1:S:wait:/sbin/sulogin
 
 # TERMINALS
+#x1:12345:respawn:/sbin/agetty 38400 console linux
 c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux
 c2:2345:respawn:/sbin/agetty 38400 tty2 linux
 c3:2345:respawn:/sbin/agetty 38400 tty3 linux