Shawn Dunn
fda9818fc2
- Do not inst binaries explicitly into /bin or /usr/bin, it is already taken
care of internally for that:
Delete 0006-Install-bin-mount.patch
Modify 0013-Correct-paths-for-openSUSE.patch
- Do not stop trying to load drivers (via add-drivers or filesystems) if one
fails
Add 0025-dracut_continue_adding_modules_also_on_error.patch
- Introduce force-drivers. mkinitrd should use this one instead of add-drivers
later, if accepted mainline
Add
0026-force_to_add_and_load_kernel_modules_other_than_via_boot_param.patch
OBS-URL: https://build.opensuse.org/request/show/232961
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=141
43 lines
1.7 KiB
Diff
43 lines
1.7 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(-)
|
|
|
|
Index: dracut-037/dracut.sh
|
|
===================================================================
|
|
--- dracut-037.orig/dracut.sh
|
|
+++ dracut-037/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
|
|
Index: dracut-037/modules.d/98systemd/rescue.service
|
|
===================================================================
|
|
--- dracut-037.orig/modules.d/98systemd/rescue.service
|
|
+++ dracut-037/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
|