diff --git a/09804a46294ce67c211d4188ce154c2f4b7fb234.patch b/09804a46294ce67c211d4188ce154c2f4b7fb234.patch new file mode 100644 index 0000000000000000000000000000000000000000..6578b09f980aec4e0ea78d6bb0d5b4ae3378ce2c --- /dev/null +++ b/09804a46294ce67c211d4188ce154c2f4b7fb234.patch @@ -0,0 +1,25 @@ +diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh +index 29485375a..bbce31a28 100755 +--- a/modules.d/00systemd/module-setup.sh ++++ b/modules.d/00systemd/module-setup.sh +@@ -66,6 +66,7 @@ install() { + \ + $systemdsystemunitdir/cryptsetup.target \ + $systemdsystemunitdir/cryptsetup-pre.target \ ++ $systemdsystemunitdir/remote-cryptsetup.target \ + $systemdsystemunitdir/emergency.target \ + $systemdsystemunitdir/sysinit.target \ + $systemdsystemunitdir/basic.target \ +diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh +index 3deee65ed..e3d6338f1 100755 +--- a/modules.d/90crypt/module-setup.sh ++++ b/modules.d/90crypt/module-setup.sh +@@ -151,8 +151,6 @@ install() { + $systemdsystemunitdir/systemd-ask-password-console.service \ + $systemdsystemunitdir/cryptsetup.target \ + $systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \ +- $systemdsystemunitdir/initrd-cryptsetup.target \ +- $systemdsystemunitdir/sysinit.target.wants/initrd-cryptsetup.target \ + systemd-ask-password systemd-tty-ask-password-agent + fi + diff --git a/dracut.spec b/dracut.spec index a85222233131910388f3d23c3e58b39f36bc6365..6f43d6f55dafab1f618a23c76a01d851babefc41 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: 09804a46294ce67c211d4188ce154c2f4b7fb234.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 +* 20201105213007668880 patch-tracking 050-4 +- append patch file of upstream repository from <09804a46294ce67c211d4188ce154c2f4b7fb234> to <09804a46294ce67c211d4188ce154c2f4b7fb234> + * 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