From 5887b84912c9eb3df2e40489ae66e1eca749ebb8 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Thu, 28 Nov 2013 10:07:59 +0100 Subject: [PATCH] Correct paths for openSUSE openSUSE has things stored in different places, so fixup the paths here. Signed-off-by: Christian Rodrigues Signed-off-by: Hannes Reinecke --- dracut.sh | 2 +- modules.d/10i18n/module-setup.sh | 2 ++ modules.d/98systemd/rescue.service | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh index c1ef474..dddb488 100755 --- a/dracut.sh +++ b/dracut.sh @@ -774,7 +774,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) [[ $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 [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh index a091f89..92b2fa3 100755 --- a/modules.d/10i18n/module-setup.sh +++ b/modules.d/10i18n/module-setup.sh @@ -96,6 +96,8 @@ install() { install_base() { inst_multiple setfont loadkeys kbd_mode stty + inst /usr/bin/setfont /bin/setfont + inst /usr/bin/loadkeys /bin/loadkeys if ! dracut_module_included "systemd"; then inst ${moddir}/console_init.sh /lib/udev/console_init diff --git a/modules.d/98systemd/rescue.service b/modules.d/98systemd/rescue.service index edc2461..d80900f 100644 --- a/modules.d/98systemd/rescue.service +++ b/modules.d/98systemd/rescue.service @@ -16,7 +16,7 @@ Environment=HOME=/ Environment=DRACUT_SYSTEMD=1 Environment=NEWROOT=/sysroot 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 -- 1.8.1.4