From d0a99d953962ac1d0eaec5114d98cd287cad6cf7 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <ch@grml.org>
Date: Sun, 21 Aug 2011 17:50:50 +0200
Subject: [PATCH] Use grml-runtty to run our ttys

Requires: grml-scripts (>> 1.4.6)
---
 etc/grml/fai/config/files/etc/inittab/GRMLBASE   | 18 +++++++++---------
 etc/grml/fai/config/files/etc/inittab/GRML_SMALL | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/etc/grml/fai/config/files/etc/inittab/GRMLBASE b/etc/grml/fai/config/files/etc/inittab/GRMLBASE
index 30257ea..67a25b1 100644
--- a/etc/grml/fai/config/files/etc/inittab/GRMLBASE
+++ b/etc/grml/fai/config/files/etc/inittab/GRMLBASE
@@ -56,16 +56,16 @@ po::powerokwait:/etc/init.d/powerfail stop
 # 4 virtual consoles with immortal shells
 # Note that on most Debian systems tty7 is used by the X Window System.
 # Use tty8 a second xserver.
-1:12345:respawn:/sbin/rungetty tty1 --noclear -u root -g root --autologin root /usr/bin/zsh-login
-2:2345:respawn:/sbin/rungetty tty2 -u root -g root --autologin root /usr/bin/grml-screen
-3:2345:respawn:/sbin/rungetty tty3 -u root -g root --autologin root /usr/bin/grml-screen
-4:2345:respawn:/sbin/rungetty tty4 -u grml -g grml --autologin grml /usr/bin/grml-init
-5:2345:respawn:/sbin/rungetty tty5 -u grml -g grml --autologin grml /usr/bin/grml-init
-6:2345:respawn:/sbin/rungetty tty6 -u grml -g grml --autologin grml /usr/bin/grml-init
+1:12345:respawn:/sbin/grml-runtty /dev/tty1 /usr/share/grml-scripts/run-welcome root
+2:2345:respawn:/sbin/grml-runtty /dev/tty2 /usr/share/grml-scripts/run-screen root
+3:2345:respawn:/sbin/grml-runtty /dev/tty3 /usr/share/grml-scripts/run-screen root
+4:2345:respawn:/sbin/grml-runtty /dev/tty4 /usr/share/grml-scripts/run-screen grml
+5:2345:respawn:/sbin/grml-runtty /dev/tty5 /bin/zsh grml
+6:2345:respawn:/sbin/grml-runtty /dev/tty6 /bin/zsh grml
 9:2345:respawn:/sbin/getty  38400 tty9
-10:2345:respawn:/bin/zsh --login -c "/usr/sbin/grml-iptstate ; /usr/bin/grml-screen" >/dev/tty10 2>&1 </dev/tty10
-11:2345:respawn:/bin/zsh --login -c "/usr/bin/htop ; /usr/bin/grml-screen" >/dev/tty11 2>&1 </dev/tty11
-12:2345:respawn:/bin/zsh --login -c "/usr/bin/grml-init-multitail ; /usr/bin/grml-screen" >/dev/tty12 2>&1 </dev/tty12
+10:2345:respawn:/sbin/grml-runtty /dev/tty10 /usr/sbin/grml-iptstate root
+11:2345:respawn:/sbin/grml-runtty /dev/tty11 /usr/bin/htop root
+12:2345:respawn:/sbin/grml-runtty /dev/tty12 /usr/share/grml-scripts/run-multitail root
 
 ################################################################################
 # Please do NOT remove the line with the marker as it is important for the
diff --git a/etc/grml/fai/config/files/etc/inittab/GRML_SMALL b/etc/grml/fai/config/files/etc/inittab/GRML_SMALL
index 41980e3..d211c7c 100644
--- a/etc/grml/fai/config/files/etc/inittab/GRML_SMALL
+++ b/etc/grml/fai/config/files/etc/inittab/GRML_SMALL
@@ -56,16 +56,16 @@ po::powerokwait:/etc/init.d/powerfail stop
 # 4 virtual consoles with immortal shells
 # Note that on most Debian systems tty7 is used by the X Window System.
 # Use tty8 a second xserver.
-1:12345:respawn:/sbin/rungetty tty1 --noclear -u root -g root --autologin root /usr/bin/zsh-login
-2:2345:respawn:/sbin/rungetty tty2 -u grml -g grml --autologin grml /usr/bin/grml-init
-3:2345:respawn:/sbin/rungetty tty3 -u grml -g grml --autologin grml /usr/bin/grml-init
-#4:2345:respawn:/sbin/rungetty tty4 -u grml -g grml --autologin grml /usr/bin/grml-init
-#5:2345:respawn:/sbin/rungetty tty5 -u grml -g grml --autologin grml /usr/bin/grml-init
-#6:2345:respawn:/sbin/rungetty tty6 -u grml -g grml --autologin grml /usr/bin/grml-init
+1:12345:respawn:/sbin/grml-runtty /dev/tty1 /usr/share/grml-scripts/run-welcome root
+2:2345:respawn:/sbin/grml-runtty /dev/tty2 /usr/share/grml-scripts/run-screen root
+3:2345:respawn:/sbin/grml-runtty /dev/tty3 /usr/share/grml-scripts/run-screen root
+#4:2345:respawn:/sbin/grml-runtty /dev/tty4 /usr/share/grml-scripts/run-screen grml
+#5:2345:respawn:/sbin/grml-runtty /dev/tty5 /bin/zsh grml
+#6:2345:respawn:/sbin/grml-runtty /dev/tty6 /bin/zsh grml
 #9:2345:respawn:/sbin/getty  38400 tty9
-#10:2345:respawn:/bin/zsh --login -c "/usr/sbin/grml-iptstate ; /usr/bin/grml-screen" >/dev/tty10 2>&1 </dev/tty10
-#11:2345:respawn:/bin/zsh --login -c "/usr/bin/htop ; /usr/bin/grml-screen" >/dev/tty11 2>&1 </dev/tty11
-#12:2345:respawn:/bin/zsh --login -c "/usr/bin/grml-init-multitail ; /usr/bin/grml-screen" >/dev/tty12 2>&1 </dev/tty12
+#10:2345:respawn:/sbin/grml-runtty /dev/tty10 /usr/sbin/grml-iptstate root
+#11:2345:respawn:/sbin/grml-runtty /dev/tty11 /usr/bin/htop root
+#12:2345:respawn:/sbin/grml-runtty /dev/tty12 /usr/share/grml-scripts/run-multitail root
 
 ################################################################################
 # Please do NOT remove the line with the marker as it is important for the
-- 
2.1.4