Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP5:Update
dracut
0631-dracut-systemd-fixed-dependencies.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0631-dracut-systemd-fixed-dependencies.patch of Package dracut
From f284ee4f0c12fc28f33fef108841cd10cbb7029a Mon Sep 17 00:00:00 2001 From: Harald Hoyer <harald@redhat.com> Date: Fri, 28 Jul 2017 09:05:34 +0200 Subject: [PATCH] dracut-systemd: fixed dependencies try to break an ordering cycle. https://github.com/dracutdevs/dracut/issues/259 (cherry picked from commit f24d205537b094939379440ee013cca88c7582ac) --- modules.d/98dracut-systemd/dracut-cmdline-ask.service | 1 - modules.d/98dracut-systemd/dracut-cmdline.service | 1 - modules.d/98dracut-systemd/dracut-emergency.service | 1 - modules.d/98dracut-systemd/dracut-initqueue.service | 1 - modules.d/98dracut-systemd/dracut-mount.service | 1 - modules.d/98dracut-systemd/dracut-pre-mount.service | 6 ++---- modules.d/98dracut-systemd/dracut-pre-pivot.service | 4 +--- modules.d/98dracut-systemd/dracut-pre-trigger.service | 1 - modules.d/98dracut-systemd/dracut-pre-udev.service | 1 - 9 files changed, 3 insertions(+), 14 deletions(-) diff --git a/modules.d/98dracut-systemd/dracut-cmdline-ask.service b/modules.d/98dracut-systemd/dracut-cmdline-ask.service index 3d233143..83717184 100644 --- a/modules.d/98dracut-systemd/dracut-cmdline-ask.service +++ b/modules.d/98dracut-systemd/dracut-cmdline-ask.service @@ -19,7 +19,6 @@ ConditionPathExists=/usr/lib/initrd-release ConditionKernelCommandLine=|rd.cmdline=ask ConditionPathExistsGlob=|/etc/cmdline.d/*.conf Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98dracut-systemd/dracut-cmdline.service b/modules.d/98dracut-systemd/dracut-cmdline.service index c22856e2..5a175e72 100644 --- a/modules.d/98dracut-systemd/dracut-cmdline.service +++ b/modules.d/98dracut-systemd/dracut-cmdline.service @@ -21,7 +21,6 @@ ConditionKernelCommandLine=|rd.break=cmdline ConditionKernelCommandLine=|resume ConditionKernelCommandLine=|noresume Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98dracut-systemd/dracut-emergency.service b/modules.d/98dracut-systemd/dracut-emergency.service index 3f1e0125..f2017bb2 100644 --- a/modules.d/98dracut-systemd/dracut-emergency.service +++ b/modules.d/98dracut-systemd/dracut-emergency.service @@ -13,7 +13,6 @@ DefaultDependencies=no After=systemd-vconsole-setup.service Wants=systemd-vconsole-setup.service Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=HOME=/ diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service index 20d6a8c2..23493e16 100644 --- a/modules.d/98dracut-systemd/dracut-initqueue.service +++ b/modules.d/98dracut-systemd/dracut-initqueue.service @@ -19,7 +19,6 @@ ConditionPathExists=/usr/lib/initrd-release ConditionPathExists=|/lib/dracut/need-initqueue ConditionKernelCommandLine=|rd.break=initqueue Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98dracut-systemd/dracut-mount.service b/modules.d/98dracut-systemd/dracut-mount.service index baa8edbc..ef141f9a 100644 --- a/modules.d/98dracut-systemd/dracut-mount.service +++ b/modules.d/98dracut-systemd/dracut-mount.service @@ -16,7 +16,6 @@ ConditionPathExists=/usr/lib/initrd-release ConditionDirectoryNotEmpty=|/lib/dracut/hooks/mount ConditionKernelCommandLine=|rd.break=mount Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98dracut-systemd/dracut-pre-mount.service b/modules.d/98dracut-systemd/dracut-pre-mount.service index c7b123cc..ad2f82f7 100644 --- a/modules.d/98dracut-systemd/dracut-pre-mount.service +++ b/modules.d/98dracut-systemd/dracut-pre-mount.service @@ -11,14 +11,12 @@ Description=dracut pre-mount hook Documentation=man:dracut-pre-mount.service(8) DefaultDependencies=no -Before=initrd-root-fs.target sysroot.mount systemd-fsck-root.service -After=dracut-initqueue.service -After=cryptsetup.target +Before=sysroot.mount systemd-fsck-root.service +After=basic.target cryptsetup.target ConditionPathExists=/usr/lib/initrd-release ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-mount ConditionKernelCommandLine=|rd.break=pre-mount Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.service b/modules.d/98dracut-systemd/dracut-pre-pivot.service index 20a872a7..906f6518 100644 --- a/modules.d/98dracut-systemd/dracut-pre-pivot.service +++ b/modules.d/98dracut-systemd/dracut-pre-pivot.service @@ -11,8 +11,7 @@ Description=dracut pre-pivot and cleanup hook Documentation=man:dracut-pre-pivot.service(8) DefaultDependencies=no -After=initrd.target initrd-parse-etc.service sysroot.mount -After=dracut-initqueue.service dracut-pre-mount.service dracut-mount.service +After=initrd.target initrd-parse-etc.service Before=initrd-cleanup.service Wants=remote-fs.target After=remote-fs.target @@ -25,7 +24,6 @@ ConditionKernelCommandLine=|rd.break ConditionPathExists=|/dev/root ConditionPathExists=|/dev/nfs Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98dracut-systemd/dracut-pre-trigger.service b/modules.d/98dracut-systemd/dracut-pre-trigger.service index 2df9d7bf..21bf675c 100644 --- a/modules.d/98dracut-systemd/dracut-pre-trigger.service +++ b/modules.d/98dracut-systemd/dracut-pre-trigger.service @@ -18,7 +18,6 @@ ConditionPathExists=/usr/lib/initrd-release ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-trigger ConditionKernelCommandLine=|rd.break=pre-trigger Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service index 1f71546b..7f0b153f 100644 --- a/modules.d/98dracut-systemd/dracut-pre-udev.service +++ b/modules.d/98dracut-systemd/dracut-pre-udev.service @@ -22,7 +22,6 @@ ConditionKernelCommandLine=|rd.driver.blacklist ConditionKernelCommandLine=|rd.driver.pre ConditionKernelCommandLine=|rd.driver.post Conflicts=shutdown.target emergency.target -Before=shutdown.target emergency.target [Service] Environment=DRACUT_SYSTEMD=1 -- 2.32.0
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
