summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2009-05-28 00:17:42 -0300
committerAllan McRae <allan@archlinux.org>2009-07-18 13:33:00 +1000
commitda966f2da8fc670e17f753b22b1365fdd72e1499 (patch)
tree74775fdf3e05f5ad3858450039f4614d5cdd693a
parentad1e81556aa351fea39ed6eaf6efbed0ba7ce894 (diff)
Convert to new initscript to new virtual console scheme2009.07-1
Just convert vc/N to ttyN in all required places. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--inittab12
-rwxr-xr-xrc.sysinit14
2 files changed, 13 insertions, 13 deletions
diff --git a/inittab b/inittab
index 4ee5c03..c64bdbd 100644
--- a/inittab
+++ b/inittab
@@ -24,12 +24,12 @@ rh:06:wait:/etc/rc.shutdown
su:S:wait:/sbin/sulogin -p
# -8 options fixes umlauts problem on login
-c1:2345:respawn:/sbin/agetty -8 38400 vc/1 linux
-c2:2345:respawn:/sbin/agetty -8 38400 vc/2 linux
-c3:2345:respawn:/sbin/agetty -8 38400 vc/3 linux
-c4:2345:respawn:/sbin/agetty -8 38400 vc/4 linux
-c5:2345:respawn:/sbin/agetty -8 38400 vc/5 linux
-c6:2345:respawn:/sbin/agetty -8 38400 vc/6 linux
+c1:2345:respawn:/sbin/agetty -8 38400 tty1 linux
+c2:2345:respawn:/sbin/agetty -8 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty -8 38400 tty3 linux
+c4:2345:respawn:/sbin/agetty -8 38400 tty4 linux
+c5:2345:respawn:/sbin/agetty -8 38400 tty5 linux
+c6:2345:respawn:/sbin/agetty -8 38400 tty6 linux
ca::ctrlaltdel:/sbin/shutdown -t3 -r now
diff --git a/rc.sysinit b/rc.sysinit
index 6ccc48a..7356b77 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -360,8 +360,8 @@ if echo "$LOCALE" | /bin/grep -qi utf ; then
# this code is needed not only for older kernels,
# but also when user has set vt.default_utf8=0 but LOCALE is *.UTF-8.
for i in $(/usr/bin/seq 0 63); do
- /usr/bin/kbd_mode -u < /dev/vc/${i}
- printf "\e%%G" > /dev/vc/${i}
+ /usr/bin/kbd_mode -u < /dev/tty${i}
+ printf "\e%%G" > /dev/tty${i}
done
# the $CONSOLE check helps us avoid this when running scripts from cron
echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e%%G"; fi' >>/etc/profile.d/locale.sh
@@ -371,8 +371,8 @@ else
stat_busy "Setting Consoles to legacy mode"
# make non-UTF-8 consoles work on 2.6.24 and newer kernels
for i in $(/usr/bin/seq 0 63); do
- /usr/bin/kbd_mode -a < /dev/vc/${i}
- printf "\e%%@" > /dev/vc/${i}
+ /usr/bin/kbd_mode -a < /dev/tty${i}
+ printf "\e%%@" > /dev/tty${i}
done
# the $CONSOLE check helps us avoid this when running scripts from cron
echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e%%@"; fi' >>/etc/profile.d/locale.sh
@@ -388,16 +388,16 @@ if [ -n "$CONSOLEFONT" ]; then
fi
for i in $(/usr/bin/seq 0 63); do
if [ -n "$CONSOLEMAP" ]; then
- /usr/bin/setfont -m $CONSOLEMAP $CONSOLEFONT -C /dev/vc/${i} >/dev/null 2>&1
+ /usr/bin/setfont -m $CONSOLEMAP $CONSOLEFONT -C /dev/tty${i} >/dev/null 2>&1
else
- /usr/bin/setfont $CONSOLEFONT -C /dev/vc/${i} >/dev/null 2>&1
+ /usr/bin/setfont $CONSOLEFONT -C /dev/tty${i} >/dev/null 2>&1
fi
done
if [ $? -ne 0 ]; then
stat_fail
else
for i in $(/usr/bin/seq 0 63); do
- printf "\e(K" > /dev/vc/${i}
+ printf "\e(K" > /dev/tty${i}
done
# the $CONSOLE check helps us avoid this when running scripts from cron
echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e(K"; fi' >>/etc/profile.d/locale.sh