Browse Source

10i18n: do not use console_init shell script, if systemd-vconsole-setup

do not use console_init shell script, if systemd-vconsole-setup is
available
master
Harald Hoyer 14 years ago
parent
commit
6019e1053c
  1. 8
      modules.d/10i18n/console_init
  2. 6
      modules.d/10i18n/parse-i18n.sh

8
modules.d/10i18n/console_init

@ -61,7 +61,6 @@ dev_open() { @@ -61,7 +61,6 @@ dev_open() {
exec 7>>${dev}
}


dev=/dev/${1#/dev/}
devname=${dev#/dev/}

@ -70,11 +69,6 @@ devname=${dev#/dev/} @@ -70,11 +69,6 @@ devname=${dev#/dev/}
exit 1
}

[ -e /tmp/console_init.${devname} ] && exit 0

if [ -x /lib/systemd/systemd-vconsole-setup ]; then
/lib/systemd/systemd-vconsole-setup
else
dev_open ${dev}

for fd in 6 7; do
@ -91,6 +85,4 @@ else @@ -91,6 +85,4 @@ else
set_keymap

dev_close
fi

>/tmp/console_init.${devname}

6
modules.d/10i18n/parse-i18n.sh

@ -35,3 +35,9 @@ if [ -f /etc/locale.conf ]; then @@ -35,3 +35,9 @@ if [ -f /etc/locale.conf ]; then
export LC_ALL
fi

if [ -x /lib/systemd/systemd-vconsole-setup ]; then
/lib/systemd/systemd-vconsole-setup
rm -f /{etc,lib}/udev/rules.d/10-console.rules
rm -f /lib/udev/console_init
ln -s /lib/systemd/systemd-vconsole-setup /lib/udev/console_init
fi

Loading…
Cancel
Save