Shawn Dunn
7955a4d13a
- Update dracut to 037 * Add --hostonly_cmdline switch * Update --mount syntax * Include modules from /updates directory * Fixes for network setup * Some small fixes - Rediff patches - Include iscsiuio again (bnc#872474) Remove: remove-iscsiuio.patch - Install 59-scsi-sg_utils.rules (bnc#872478) Add: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch - Install 67-kpartx-compat.rules (bnc#872662) Add: 0016-90multipath-add-67-kpartx-compat.rules.patch - Install separate multipath service file (bnc#871610) Add: 0017-90multipath-install-dracut-specific-service-file.patch - Do not fsck and mount from fstab if systemd is used (bnc# Add: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch - Fixup initqueue for remote-fs Add: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch OBS-URL: https://build.opensuse.org/request/show/229484 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=124
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 5887b84912c9eb3df2e40489ae66e1eca749ebb8 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
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 <crrodriguez@opensuse.org>
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
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
|
|
|