Do not call plymouth with full path
parent
cdcb27a4fe
commit
ca2c693679
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
[[ "$mount_needs" ]] && return 1
|
[[ "$mount_needs" ]] && return 1
|
||||||
[[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
|
type -P plymouthd >/dev/null && type -P plymouth >/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
depends() {
|
depends() {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||||
[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
|
plymouth --hide-splash 2>/dev/null || :
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||||
|
|
||||||
if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
|
if type plymouth >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
|
||||||
/bin/plymouth --newroot=$NEWROOT
|
plymouth --newroot=$NEWROOT
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -4,15 +4,14 @@
|
||||||
PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
|
PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
|
||||||
PLYMOUTH_THEME=$(plymouth-set-default-theme)
|
PLYMOUTH_THEME=$(plymouth-set-default-theme)
|
||||||
|
|
||||||
inst /sbin/plymouthd /bin/plymouthd
|
dracut_install plymouthd plymouth \
|
||||||
dracut_install /bin/plymouth \
|
|
||||||
"${PLYMOUTH_LOGO_FILE}" \
|
"${PLYMOUTH_LOGO_FILE}" \
|
||||||
/etc/system-release
|
/etc/system-release
|
||||||
|
|
||||||
mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
|
mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
|
||||||
|
|
||||||
inst_libdir_file "plymouth/text.so" "plymouth/details.so"
|
inst_libdir_file "plymouth/text.so" "plymouth/details.so"
|
||||||
|
|
||||||
if [[ $hostonly ]]; then
|
if [[ $hostonly ]]; then
|
||||||
dracut_install \
|
dracut_install \
|
||||||
"/usr/share/plymouth/themes/details/details.plymouth" \
|
"/usr/share/plymouth/themes/details/details.plymouth" \
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||||
|
|
||||||
if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
|
if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
|
||||||
if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
|
if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
|
||||||
# first trigger graphics subsystem
|
# first trigger graphics subsystem
|
||||||
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
|
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
|
||||||
|
@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
|
||||||
read consoledev rest < /sys/class/tty/console/active
|
read consoledev rest < /sys/class/tty/console/active
|
||||||
consoledev=${consoledev:-tty0}
|
consoledev=${consoledev:-tty0}
|
||||||
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
|
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
|
||||||
[ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
|
plymouthd --attach-to-session --pid-file /run/plymouth/pid
|
||||||
/bin/plymouth --show-splash 2>&1 | vinfo
|
plymouth --show-splash 2>&1 | vinfo
|
||||||
# reset tty after plymouth messed with it
|
# reset tty after plymouth messed with it
|
||||||
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
|
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -47,8 +47,8 @@ ask_for_password() {
|
||||||
|
|
||||||
{ flock -s 9;
|
{ flock -s 9;
|
||||||
# Prompt for password with plymouth, if installed and running.
|
# Prompt for password with plymouth, if installed and running.
|
||||||
if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
|
if type plymouth >/dev/null 2>&1 && plymouth --ping 2>/dev/null; then
|
||||||
/bin/plymouth ask-for-password \
|
plymouth ask-for-password \
|
||||||
--prompt "$ply_prompt" --number-of-tries=$ply_tries \
|
--prompt "$ply_prompt" --number-of-tries=$ply_tries \
|
||||||
--command="$ply_cmd"
|
--command="$ply_cmd"
|
||||||
ret=$?
|
ret=$?
|
||||||
|
|
|
@ -31,7 +31,7 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
|
||||||
fi
|
fi
|
||||||
getarg rd.live.check -d check || check=""
|
getarg rd.live.check -d check || check=""
|
||||||
if [ -n "$check" ]; then
|
if [ -n "$check" ]; then
|
||||||
[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
|
type plymouth >/dev/null 2>&1 && plymouth --hide-splash
|
||||||
if [ -n "$DRACUT_SYSTEMD" ]; then
|
if [ -n "$DRACUT_SYSTEMD" ]; then
|
||||||
p=$(str_replace "$livedev" "-" '\x2d')
|
p=$(str_replace "$livedev" "-" '\x2d')
|
||||||
systemctl start checkisomd5@${p}.service
|
systemctl start checkisomd5@${p}.service
|
||||||
|
@ -42,7 +42,7 @@ if [ -n "$check" ]; then
|
||||||
die "CD check failed!"
|
die "CD check failed!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
[ -x /bin/plymouth ] && /bin/plymouth --show-splash
|
type plymouth >/dev/null 2>&1 && plymouth --show-splash
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ln -s $livedev /run/initramfs/livedev
|
ln -s $livedev /run/initramfs/livedev
|
||||||
|
|
|
@ -10,7 +10,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
||||||
|
|
||||||
source_conf /etc/conf.d
|
source_conf /etc/conf.d
|
||||||
|
|
||||||
[ -x /bin/plymouth ] && /bin/plymouth quit
|
type plymouth >/dev/null 2>&1 && plymouth quit
|
||||||
|
|
||||||
export _rdshell_name="dracut" action="Boot" hook="emergency"
|
export _rdshell_name="dracut" action="Boot" hook="emergency"
|
||||||
|
|
||||||
|
|
|
@ -971,8 +971,8 @@ emergency_shell()
|
||||||
shift 2
|
shift 2
|
||||||
elif [ "$1" = "--shutdown" ]; then
|
elif [ "$1" = "--shutdown" ]; then
|
||||||
_rdshell_name=$2; action="Shutdown"; hook="shutdown-emergency"
|
_rdshell_name=$2; action="Shutdown"; hook="shutdown-emergency"
|
||||||
if [ -x /bin/plymouth ]; then
|
if type plymouth >/dev/null 2>&1; then
|
||||||
/bin/plymouth --hide-splash
|
plymouth --hide-splash
|
||||||
elif [ -x /oldroot/bin/plymouth ]; then
|
elif [ -x /oldroot/bin/plymouth ]; then
|
||||||
/oldroot/bin/plymouth --hide-splash
|
/oldroot/bin/plymouth --hide-splash
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue