commit 6b59a75b1e67aad5230cd8b09fd0de19d79ef01d
Author: Jan Palus <[email protected]>
Date: Thu Nov 12 11:32:24 2020 +0100
stop complaining about missing systemd-ask-password-plymouth.service; rel 3
dracut.spec | 4 +++-
non_existent_systemd_units.patch | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/dracut.spec b/dracut.spec
index bf875c4..0aa4d61 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -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
index 0000000..1428505
--- /dev/null
+++ b/non_existent_systemd_units.patch
@@ -0,0 +1,22 @@
+From 3a4a212649bd89f5a07ccf87a53b3103094748a3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <[email protected]>
+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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/6b59a75b1e67aad5230cd8b09fd0de19d79ef01d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
