stop complaining about missing systemd-ask-password-plymouth.service; rel 3 auto/th/dracut-050-3
authorJan Palus <atler@pld-linux.org>
Thu, 12 Nov 2020 10:32:24 +0000 (11:32 +0100)
committerJan Palus <atler@pld-linux.org>
Thu, 12 Nov 2020 10:32:24 +0000 (11:32 +0100)
dracut.spec
non_existent_systemd_units.patch [new file with mode: 0644]

index bf875c4a3e4d56ddc1bbc5bd7d14f6becdd8a3a3..0aa4d6154b336b4cbaf80e2c7a5ec6d7d8af2427 100644 (file)
@@ -2,7 +2,7 @@ Summary:        Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
 Version:       050
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Base
 Source0:       https://git.kernel.org/pub/scm/boot/dracut/dracut.git/snapshot/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ Patch1:               os-release.patch
 Patch2:                arch-libdir.patch
 Patch3:                systemd-paths.patch
 Patch4:                cryptsetup.patch
+Patch5:                non_existent_systemd_units.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -181,6 +182,7 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__sed} -i -e 's,@libexecdir@,%{_libexecdir},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
diff --git a/non_existent_systemd_units.patch b/non_existent_systemd_units.patch
new file mode 100644 (file)
index 0000000..1428505
--- /dev/null
@@ -0,0 +1,22 @@
+From 3a4a212649bd89f5a07ccf87a53b3103094748a3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 20 Apr 2020 15:07:02 +0200
+Subject: [PATCH] systemd: skip dependency add for non-existent units
+
+Fixes: https://github.com/dracutdevs/dracut/issues/795
+---
+ modules.d/00systemd/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
+index 5ebdfc301..17be74fd9 100755
+--- a/modules.d/00systemd/module-setup.sh
++++ b/modules.d/00systemd/module-setup.sh
+@@ -241,6 +241,7 @@ install() {
+         systemd-ask-password-console.service \
+         systemd-ask-password-plymouth.service \
+         ; do
++        [[ -f $systemdsystemunitdir/$i ]] || continue
+         systemctl -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
+     done
This page took 0.981391 seconds and 4 git commands to generate.