File correct-paths-for-opensuse.patch of Package dracut
--- dracut-024/modules.d/10i18n/module-setup.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/10i18n/module-setup.sh 2012-11-01 19:52:37.196044993 +0100
@@ -86,6 +86,8 @@
install_base() {
dracut_install setfont loadkeys kbd_mode stty
+ inst /usr/bin/setfont /bin/setfont
+ inst /usr/bin/loadkeys /bin/loadkeys
inst ${moddir}/console_init.sh /lib/udev/console_init
inst_rules ${moddir}/10-console.rules
inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
--- dracut-024/modules.d/50plymouth/module-setup.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/module-setup.sh 2012-11-01 19:52:37.196044993 +0100
@@ -4,7 +4,7 @@
check() {
[[ "$mount_needs" ]] && return 1
- [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
+ [[ -x /usr/sbin/plymouthd && -x /usr/bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
}
depends() {
@@ -64,12 +64,12 @@
}
install() {
- if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
- || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
+ if grep -q nash /usr/lib/plymouth/plymouth-populate-initrd \
+ || [ ! -x /usr/lib/plymouth/plymouth-populate-initrd ]; then
. "$moddir"/plymouth-populate-initrd.sh
else
PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
- /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
+ /usr/lib/plymouth/plymouth-populate-initrd -t $initdir
fi
inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
--- dracut-024/modules.d/50plymouth/plymouth-emergency.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/plymouth-emergency.sh 2012-11-01 19:52:37.196044993 +0100
@@ -1,4 +1,4 @@
#!/bin/sh
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+[ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash
--- dracut-024/modules.d/50plymouth/plymouth-newroot.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/plymouth-newroot.sh 2012-11-01 19:52:37.196044993 +0100
@@ -2,6 +2,6 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
- /bin/plymouth --newroot=$NEWROOT
+if [ -x /usr/bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
+ /usr/bin/plymouth --newroot=$NEWROOT
fi
--- dracut-024/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-11-01 19:52:37.196044993 +0100
@@ -4,8 +4,8 @@
PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
PLYMOUTH_THEME=$(plymouth-set-default-theme)
-inst /sbin/plymouthd /bin/plymouthd
-dracut_install /bin/plymouth \
+inst /usr/sbin/plymouthd /usr/sbin/plymouthd
+dracut_install /usr/bin/plymouth \
"${PLYMOUTH_LOGO_FILE}" \
/etc/system-release
--- dracut-024/modules.d/50plymouth/plymouth-pretrigger.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/plymouth-pretrigger.sh 2012-11-01 19:52:37.196044993 +0100
@@ -2,7 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
+if [ -x /usr/sbin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
# first trigger graphics subsystem
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
@@ -16,8 +16,8 @@
read consoledev rest < /sys/class/tty/console/active
consoledev=${consoledev:-tty0}
[ -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
- /bin/plymouth --show-splash 2>&1 | vinfo
+ [ -x /usr/sbin/plymouthd ] && /usr/sbin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+ /usr/bin/plymouth --show-splash 2>&1 | vinfo
# reset tty after plymouth messed with it
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
fi
--- dracut-024/modules.d/95udev-rules/module-setup.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/95udev-rules/module-setup.sh 2012-11-01 19:53:58.859048946 +0100
@@ -11,6 +11,8 @@
dracut_install udevadm cat uname blkid \
/etc/udev/udev.conf
+ inst /usr/sbin/blkid /sbin/blkid
+
[ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /lib/systemd/systemd-udevd /sbin/udevd; do
[ -x "$_i" ] || continue
--- a/dracut.sh
+++ b/dracut.sh
@@ -561,7 +561,7 @@
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
+[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel"
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
[[ $tmpdir ]] || tmpdir=/var/tmp
[[ $compress_l ]] && compress=$compress_l
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -69,7 +69,7 @@
}
install() {
- dracut_install -o /lib/modprobe.d/*.conf
+ dracut_install -o /etc/modprobe.d/*.conf
[[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf
inst_hook cmdline 01 "$moddir/parse-kernel.sh"
inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
--- dracut-024/modules.d/90crypt/crypt-lib.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/90crypt/crypt-lib.sh 2012-11-02 23:39:56.702130681 +0100
@@ -47,8 +47,8 @@
{ flock -s 9;
# Prompt for password with plymouth, if installed and running.
- if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
- /bin/plymouth ask-for-password \
+ if [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --ping; then
+ /usr/bin/plymouth ask-for-password \
--prompt "$ply_prompt" --number-of-tries=$ply_tries \
--command="$ply_cmd"
ret=$?
--- dracut-024/modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-11-02 23:40:31.807132380 +0100
@@ -31,13 +31,13 @@
fi
getarg rd.live.check -d check || check=""
if [ -n "$check" ]; then
- [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash
checkisomd5 --verbose $livedev
if [ $? -ne 0 ]; then
die "CD check failed!"
exit 1
fi
- [ -x /bin/plymouth ] && /bin/plymouth --show-splash
+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --show-splash
fi
ln -s $livedev /run/initramfs/livedev
--- dracut-024/modules.d/98systemd/dracut-emergency.service 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/98systemd/dracut-emergency.service 2012-11-02 23:41:13.214134384 +0100
@@ -14,7 +14,7 @@
[Service]
Environment=HOME=/
WorkingDirectory=/
-ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/usr/bin/plymouth quit
ExecStartPre=-/bin/echo -e '\n\nEntering emergency mode. Exit the shell to continue.\nType "journalctl" to view system logs.\n'
ExecStart=-/bin/sh -i -l
ExecStopPost=-/bin/rm -f /.console_lock
--- dracut-024/modules.d/98systemd/rescue.service 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/98systemd/rescue.service 2012-11-02 23:42:36.401138410 +0100
@@ -14,7 +14,7 @@
[Service]
Environment=HOME=/
WorkingDirectory=/
-ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/usr/bin/plymouth quit
ExecStart=-/bin/sh -i -l
ExecStopPost=-/bin/rm -f /.console_lock
ExecStopPost=-/usr/bin/systemctl --fail --no-block default
