diff --git a/a23a4680e7d04d1016e9d5e4b53b1e65f1ca98aa.patch b/a23a4680e7d04d1016e9d5e4b53b1e65f1ca98aa.patch new file mode 100644 index 0000000000000000000000000000000000000000..d9fc34ca764dcb943160c74a73790ff4d50d7902 --- /dev/null +++ b/a23a4680e7d04d1016e9d5e4b53b1e65f1ca98aa.patch @@ -0,0 +1,22 @@ +diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh +index e3d6338f1..58e5f34e6 100755 +--- a/modules.d/90crypt/module-setup.sh ++++ b/modules.d/90crypt/module-setup.sh +@@ -144,6 +144,8 @@ install() { + inst_script "$moddir/crypt-run-generator.sh" "/sbin/crypt-run-generator" + + if dracut_module_included "systemd"; then ++ # the cryptsetup targets are already pulled in by 00systemd, but not ++ # the enablement symlinks + inst_multiple -o \ + $systemdutildir/system-generators/systemd-cryptsetup-generator \ + $systemdutildir/systemd-cryptsetup \ +@@ -151,6 +153,8 @@ install() { + $systemdsystemunitdir/systemd-ask-password-console.service \ + $systemdsystemunitdir/cryptsetup.target \ + $systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \ ++ $systemdsystemunitdir/remote-cryptsetup.target \ ++ $systemdsystemunitdir/initrd-root-device.target.wants/remote-cryptsetup.target \ + systemd-ask-password systemd-tty-ask-password-agent + fi + diff --git a/dracut.spec b/dracut.spec index a85222233131910388f3d23c3e58b39f36bc6365..0f3f3bce5dd3445f9a35cb344258db652036f6ee 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,7 +9,7 @@ Name: dracut Version: 050 -Release: 3 +Release: 4 Summary: Initramfs generator using udev @@ -38,6 +38,7 @@ Patch10: dracut-lib.sh-quote-variables-in-parameter-expansion.patch Patch11: dracut-90crypt-module-setup.sh-fix-force-on-multiple-lines.patch Patch12: Fix-test-in-lsinitrd.patch Patch13: add-option-to-include-file-metadata-in-initramfs.patch +Patch6000: a23a4680e7d04d1016e9d5e4b53b1e65f1ca98aa.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source2: openEuler.conf.example @@ -488,6 +489,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %endif %changelog +* 20201114233007665176 patch-tracking 050-4 +- append patch file of upstream repository from to + * Thu Jul 23 2020 Liquor - 050-1 - Update to 050 @@ -516,4 +520,4 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne - Delete redundant information * Thu Aug 29 2019 openEuler Buildteam - 049-1 -- Package init +- Package init \ No newline at end of file