diff --git a/1ec85e52323c3f7999516adc84eb7daa8018bd8d.patch b/1ec85e52323c3f7999516adc84eb7daa8018bd8d.patch new file mode 100644 index 0000000000000000000000000000000000000000..724425361ba80fbd3ed92e93e2a54fdcf9b7388f --- /dev/null +++ b/1ec85e52323c3f7999516adc84eb7daa8018bd8d.patch @@ -0,0 +1,31 @@ +diff --git a/modules.d/90multipath/multipath-shutdown.sh b/modules.d/90multipath/multipath-shutdown.sh +index f160f45ed..8f9ea99cd 100755 +--- a/modules.d/90multipath/multipath-shutdown.sh ++++ b/modules.d/90multipath/multipath-shutdown.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + for i in $(multipath -l -v1); do + if ! dmsetup table $i | sed -n '/.*queue_if_no_path.*/q1' ; then +diff --git a/modules.d/98dracut-systemd/dracut-cmdline-ask.sh b/modules.d/98dracut-systemd/dracut-cmdline-ask.sh +index f410f464e..fd64a68dc 100755 +--- a/modules.d/98dracut-systemd/dracut-cmdline-ask.sh ++++ b/modules.d/98dracut-systemd/dracut-cmdline-ask.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh + +@@ -15,8 +15,8 @@ echo + echo + echo "Enter additional kernel command line parameter (end with ctrl-d or .)" + while read -e -p "> " line || [ -n "$line" ]; do +- [[ "$line" == "." ]] && break +- [[ "$line" ]] && printf -- "%s\n" "$line" >> /etc/cmdline.d/99-cmdline-ask.conf ++ [ "$line" = "." ] && break ++ [ -n "$line" ] && printf -- "%s\n" "$line" >> /etc/cmdline.d/99-cmdline-ask.conf + done + + exit 0 diff --git a/dracut.spec b/dracut.spec index a85222233131910388f3d23c3e58b39f36bc6365..8c034b13f1797dc514bd6d704ad13e5391de8309 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: 1ec85e52323c3f7999516adc84eb7daa8018bd8d.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 +* 20201115003007666518 patch-tracking 050-4 +- append patch file of upstream repository from <1ec85e52323c3f7999516adc84eb7daa8018bd8d> to <1ec85e52323c3f7999516adc84eb7daa8018bd8d> + * 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