console_init/plymouth: use systemd-vconsole, if available

also init the console before starting the plymouth daemon
master
Harald Hoyer 2011-04-28 17:33:26 +02:00
parent a7ee1cd7f6
commit c99014d5ef
3 changed files with 20 additions and 14 deletions

View File

@ -72,20 +72,25 @@ devname=${dev#/dev/}

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

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

for fd in 6 7; do
if ! [ -t ${fd} ]; then
echo "ERROR: File descriptor not opened: ${fd}" >&2
dev_close
exit 1
fi
done
for fd in 6 7; do
if ! [ -t ${fd} ]; then
echo "ERROR: File descriptor not opened: ${fd}" >&2
dev_close
exit 1
fi
done

set_keyboard
set_terminal ${dev}
set_font ${dev}
set_keymap
set_keyboard
set_terminal ${dev}
set_font ${dev}
set_keymap

dev_close
fi

dev_close
>/tmp/console_init.${devname}

View File

@ -11,6 +11,7 @@ depends() {
}

install() {
[ -x /lib/systemd/systemd-vconsole ] && dracut_install /lib/systemd/systemd-vconsole
KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
DEFAULT_FONT=LatArCyrHeb-16
I18N_CONF="/etc/locale.conf"

View File

@ -18,7 +18,7 @@ if getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then

info "Starting plymouth daemon"
mkdir -m 0755 /run/plymouth
[ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
[ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
[ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
/bin/plymouth --show-splash 2>&1 | vinfo
fi