From 08e8cdf146199d238dcd1d408f6f44b5a9bf089e Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 20 Oct 2020 22:30:12 +0800 Subject: [PATCH 1/2] [patch tracking] 20201020223007664405 - https://github.com/dracutdevs/dracut/commit/12ab0dce66f07f54304d690cc07a5a72396e2939 --- 12ab0dce66f07f54304d690cc07a5a72396e2939.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 12ab0dce66f07f54304d690cc07a5a72396e2939.patch diff --git a/12ab0dce66f07f54304d690cc07a5a72396e2939.patch b/12ab0dce66f07f54304d690cc07a5a72396e2939.patch new file mode 100644 index 0000000..be8e9db --- /dev/null +++ b/12ab0dce66f07f54304d690cc07a5a72396e2939.patch @@ -0,0 +1,12 @@ +diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh +index c623e76f4..a05629504 100755 +--- a/modules.d/90dmsquash-live/iso-scan.sh ++++ b/modules.d/90dmsquash-live/iso-scan.sh +@@ -22,6 +22,7 @@ do_iso_scan() { + mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue + if [ -f "/run/initramfs/isoscan/$isofile" ]; then + losetup -f "/run/initramfs/isoscan/$isofile" ++ ln -s $dev /run/initramfs/isoscandev + rm -f -- "$job" + exit 0 + else -- Gitee From a52e1f1f81b55a941ada4f4af2d3c30a8c12d91d Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 20 Oct 2020 22:30:13 +0800 Subject: [PATCH 2/2] [patch tracking] 20201020223007664405 - update spec file --- dracut.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dracut.spec b/dracut.spec index a852222..d2f02d0 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: 12ab0dce66f07f54304d690cc07a5a72396e2939.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 +* 20201020223007664405 patch-tracking 050-4 +- append patch file of upstream repository from <12ab0dce66f07f54304d690cc07a5a72396e2939> to <12ab0dce66f07f54304d690cc07a5a72396e2939> + * 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 -- Gitee