186b097a81
- 01fips: Fix typo (bsc#1033238) * adds 0522-Fix-typo-from-commit-3f1cdb520.patch - 98dracut-systemd: Fix module force loading with systemd (bsc#986216) * adds 0523-98dracut-systemd-Fix-module-force-loading-with-syste.patch OBS-URL: https://build.opensuse.org/request/show/504254 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=310
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From cf7069480ebad261ca76e1e074f0fddf1c38497b Mon Sep 17 00:00:00 2001
|
|
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
Date: Fri, 16 Jun 2017 16:32:56 +0200
|
|
Subject: [PATCH 2/2] 98dracut-systemd: Fix module force loading with systemd
|
|
|
|
This used to work only when specified via the command line
|
|
or if systemd was not being used. However, the exisistence of
|
|
20_force_driver.conf also requires dracut-pre-udev.service
|
|
to be run.
|
|
|
|
Reference: bsc#986216
|
|
---
|
|
modules.d/98dracut-systemd/dracut-pre-udev.service | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service
|
|
index 73740bef..43408f3e 100644
|
|
--- a/modules.d/98dracut-systemd/dracut-pre-udev.service
|
|
+++ b/modules.d/98dracut-systemd/dracut-pre-udev.service
|
|
@@ -15,6 +15,7 @@ Before=systemd-udevd.service dracut-pre-trigger.service
|
|
After=dracut-cmdline.service
|
|
Wants=dracut-cmdline.service
|
|
ConditionPathExists=/usr/lib/initrd-release
|
|
+ConditionPathExists=|/etc/cmdline.d/20-force_drivers.conf
|
|
ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-udev
|
|
ConditionKernelCommandLine=|rd.break=pre-udev
|
|
ConditionKernelCommandLine=|rd.driver.blacklist
|
|
--
|
|
2.12.3
|
|
|