Thomas Renninger
9f28177407
- Update to dracut mainline version 041. Half of the patches got integrated mainline. Some others have been merged together when it made sense some have been left out, but are still in the repository as they need some special treating and mainline discussion whether/how they get added. These are also not urgently needed, but are debugging patches. I broke the rule here to mention every added/deleted/modified patch as every patch is touched and every 2nd got removed (mainline integrated). I also re-ordered the patches in the PatchXY: area for easier merging them and get them discussed and posted mainline easier, topic by topic. OBS-URL: https://build.opensuse.org/request/show/293267 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=214
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From 3c3453e92ae055674bd3260a23c98d64a1f2467d 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/98systemd/rescue.service | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: dracut-041/dracut.sh
|
|
===================================================================
|
|
--- dracut-041.orig/dracut.sh 2015-03-16 17:47:39.671230783 +0100
|
|
+++ dracut-041/dracut.sh 2015-03-16 17:47:45.231540139 +0100
|
|
@@ -809,7 +809,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
|
|
[[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
|
|
Index: dracut-041/modules.d/98systemd/rescue.service
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/98systemd/rescue.service 2015-01-31 12:54:52.000000000 +0100
|
|
+++ dracut-041/modules.d/98systemd/rescue.service 2015-03-16 17:47:45.235540363 +0100
|
|
@@ -16,7 +16,7 @@
|
|
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
|