From b95bc7e4e8285fc966ef295dff75da36bba00bdb Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 15 Nov 2020 03:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201115033007665676 - https://github.com/dracutdevs/dracut/commit/6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e --- 6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e.patch diff --git a/6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e.patch b/6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e.patch new file mode 100644 index 0000000..c6a8b65 --- /dev/null +++ b/6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e.patch @@ -0,0 +1,13 @@ +diff --git a/dracut-init.sh b/dracut-init.sh +index 837267aa8..592a55069 100644 +--- a/dracut-init.sh ++++ b/dracut-init.sh +@@ -839,7 +839,7 @@ check_module() { + [[ $2 ]] || mods_checked_as_dep+=" $_mod " + + if [[ " $omit_dracutmodules " == *\ $_mod\ * ]]; then +- dinfo "dracut module '$_mod' will not be installed, because it's in the list to be omitted!" ++ ddebug "dracut module '$_mod' will not be installed, because it's in the list to be omitted!" + return 1 + fi + -- Gitee From dce315be6db4d33d8bc2b407fe6fd039d6e36001 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 15 Nov 2020 03:30:11 +0800 Subject: [PATCH 2/2] [patch tracking] 20201115033007665676 - update spec file --- dracut.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dracut.spec b/dracut.spec index a852222..acbcc72 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: 6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e.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 +* 20201115033007665676 patch-tracking 050-4 +- append patch file of upstream repository from <6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e> to <6b8ee4fc37f686cc7c3a1a716e0c1ebe9f0eb48e> + * 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