From 35595ca3d0eade792e7becc5157f1ae120bdd65d Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 21 Oct 2020 23:30:16 +0800 Subject: [PATCH 1/5] [patch tracking] 20201021233007665593 - https://github.com/dracutdevs/dracut/commit/9fb2431a88bf5bb290bce63d63f80ca350b4a836 --- 9fb2431a88bf5bb290bce63d63f80ca350b4a836.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 9fb2431a88bf5bb290bce63d63f80ca350b4a836.patch diff --git a/9fb2431a88bf5bb290bce63d63f80ca350b4a836.patch b/9fb2431a88bf5bb290bce63d63f80ca350b4a836.patch new file mode 100644 index 0000000..f42dc0e --- /dev/null +++ b/9fb2431a88bf5bb290bce63d63f80ca350b4a836.patch @@ -0,0 +1,12 @@ +diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh +index f43b2e5d5..e3d6338f1 100755 +--- a/modules.d/90crypt/module-setup.sh ++++ b/modules.d/90crypt/module-setup.sh +@@ -151,7 +151,6 @@ install() { + $systemdsystemunitdir/systemd-ask-password-console.service \ + $systemdsystemunitdir/cryptsetup.target \ + $systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \ +- $systemdsystemunitdir/initrd-root-fs.target.wants/remote-cryptsetup.target \ + systemd-ask-password systemd-tty-ask-password-agent + fi + -- Gitee From 03e214209d949b325ca9c424bd76e79d7ec684a2 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 21 Oct 2020 23:30:17 +0800 Subject: [PATCH 2/5] [patch tracking] 20201021233007665593 - https://github.com/dracutdevs/dracut/commit/8f56daa8c3c75b167823286553f223e5b46cd6ab --- ...daa8c3c75b167823286553f223e5b46cd6ab.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 8f56daa8c3c75b167823286553f223e5b46cd6ab.patch diff --git a/8f56daa8c3c75b167823286553f223e5b46cd6ab.patch b/8f56daa8c3c75b167823286553f223e5b46cd6ab.patch new file mode 100644 index 0000000..31f23b0 --- /dev/null +++ b/8f56daa8c3c75b167823286553f223e5b46cd6ab.patch @@ -0,0 +1,25 @@ +diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh +index bbce31a28..29485375a 100755 +--- a/modules.d/00systemd/module-setup.sh ++++ b/modules.d/00systemd/module-setup.sh +@@ -66,7 +66,6 @@ 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 e3d6338f1..3deee65ed 100755 +--- a/modules.d/90crypt/module-setup.sh ++++ b/modules.d/90crypt/module-setup.sh +@@ -151,6 +151,8 @@ 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 + -- Gitee From b7bb0ff96efdf6eb5d97d03dbc7afcced7a59d5a Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 21 Oct 2020 23:30:17 +0800 Subject: [PATCH 3/5] [patch tracking] 20201021233007665593 - https://github.com/dracutdevs/dracut/commit/c050190f86c8e6e66087b7bd076f9ed117756d65 --- c050190f86c8e6e66087b7bd076f9ed117756d65.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 c050190f86c8e6e66087b7bd076f9ed117756d65.patch diff --git a/c050190f86c8e6e66087b7bd076f9ed117756d65.patch b/c050190f86c8e6e66087b7bd076f9ed117756d65.patch new file mode 100644 index 0000000..d2344f2 --- /dev/null +++ b/c050190f86c8e6e66087b7bd076f9ed117756d65.patch @@ -0,0 +1,16 @@ +diff --git a/dracut-functions.sh b/dracut-functions.sh +index e0ca75742..530452068 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -674,6 +674,11 @@ check_kernel_config() + return 1 + } + ++# 0 if the kernel module is either built-in or available ++# 1 if the kernel module is not enabled ++check_kernel_module() { ++ modprobe -S $kernel --dry-run $1 &>/dev/null || return 1 ++} + + # get_cpu_vendor + # Only two values are returned: AMD or Intel -- Gitee From ad81f2111fd91077f96520c234798c9a73166304 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 21 Oct 2020 23:30:17 +0800 Subject: [PATCH 4/5] [patch tracking] 20201021233007665593 - https://github.com/dracutdevs/dracut/commit/83c65fd3db9f5f3436cfe74ec67d2894dedda397 --- ...5fd3db9f5f3436cfe74ec67d2894dedda397.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 83c65fd3db9f5f3436cfe74ec67d2894dedda397.patch diff --git a/83c65fd3db9f5f3436cfe74ec67d2894dedda397.patch b/83c65fd3db9f5f3436cfe74ec67d2894dedda397.patch new file mode 100644 index 0000000..6d682f2 --- /dev/null +++ b/83c65fd3db9f5f3436cfe74ec67d2894dedda397.patch @@ -0,0 +1,49 @@ +diff --git a/dracut.sh b/dracut.sh +index 2f2fadd1b..c03d9c58c 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1846,17 +1846,6 @@ fi + + if dracut_module_included "squash"; then + dinfo "*** Install squash loader ***" +- for config in \ +- CONFIG_SQUASHFS \ +- CONFIG_OVERLAY_FS \ +- CONFIG_DEVTMPFS; +- do +- if ! check_kernel_config $config; then +- dfatal "$config have to be enabled for dracut squash module to work" +- exit 1 +- fi +- done +- + readonly squash_dir="$initdir/squash/root" + readonly squash_img="$initdir/squash/root.img" + readonly squash_candidate=( "usr" "etc" ) +diff --git a/modules.d/99squash/module-setup.sh b/modules.d/99squash/module-setup.sh +index 6307377c9..5a6546ad3 100644 +--- a/modules.d/99squash/module-setup.sh ++++ b/modules.d/99squash/module-setup.sh +@@ -11,6 +11,13 @@ check() { + return 1 + fi + ++ for i in squashfs loop overlay; do ++ if ! check_kernel_module $i; then ++ derror "dracut-squash module requires kernel module $i" ++ return 1 ++ fi ++ done ++ + return 255 + } + +@@ -20,7 +27,7 @@ depends() { + } + + installkernel() { +- hostonly="" instmods -c squashfs loop overlay ++ hostonly="" instmods squashfs loop overlay + } + + install() { -- Gitee From f1ace5d329cb95bb9a404e11224327cbbd0da231 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 21 Oct 2020 23:30:18 +0800 Subject: [PATCH 5/5] [patch tracking] 20201021233007665593 - update spec file --- dracut.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dracut.spec b/dracut.spec index a852222..0b4be26 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,10 @@ 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: 9fb2431a88bf5bb290bce63d63f80ca350b4a836.patch +Patch6001: 8f56daa8c3c75b167823286553f223e5b46cd6ab.patch +Patch6002: c050190f86c8e6e66087b7bd076f9ed117756d65.patch +Patch6003: 83c65fd3db9f5f3436cfe74ec67d2894dedda397.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source2: openEuler.conf.example @@ -488,6 +492,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %endif %changelog +* 20201021233007665593 patch-tracking 050-4 +- append patch file of upstream repository from <9fb2431a88bf5bb290bce63d63f80ca350b4a836> to <83c65fd3db9f5f3436cfe74ec67d2894dedda397> + * Thu Jul 23 2020 Liquor - 050-1 - Update to 050 @@ -516,4 +523,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