Merge remote-tracking branch 'origin/main' into f33
This commit is contained in:
commit
8ef7f80dd2
3
.gitignore
vendored
3
.gitignore
vendored
@ -35,3 +35,6 @@
|
|||||||
/dracut-048.tar.xz
|
/dracut-048.tar.xz
|
||||||
/dracut-049.tar.xz
|
/dracut-049.tar.xz
|
||||||
/dracut-050.tar.xz
|
/dracut-050.tar.xz
|
||||||
|
/dracut-051.tar.xz
|
||||||
|
/dracut-053.tar.xz
|
||||||
|
/dracut-054.tar.xz
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
From 89cd7a46296b34230c21775b24b226cc47ec1527 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nicolas Chauvet <kwizart@gmail.com>
|
|
||||||
Date: Sat, 26 Sep 2020 14:50:31 +0200
|
|
||||||
Subject: [PATCH 1/3] 50drm: fix ambiguous redirects
|
|
||||||
|
|
||||||
If i contains a space, there is a need to protect the variable usage in some cases.
|
|
||||||
|
|
||||||
This will occurs when a next patch will enable platform bus with such case:
|
|
||||||
'/sys/bus/platform/devices/Fixed MDIO bus.0'
|
|
||||||
|
|
||||||
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
|
|
||||||
---
|
|
||||||
modules.d/50drm/module-setup.sh | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh
|
|
||||||
index c69b2cfa..81d2e662 100755
|
|
||||||
--- a/modules.d/50drm/module-setup.sh
|
|
||||||
+++ b/modules.d/50drm/module-setup.sh
|
|
||||||
@@ -33,8 +33,8 @@ installkernel() {
|
|
||||||
if [[ $hostonly ]]; then
|
|
||||||
for i in /sys/bus/{pci/devices,virtio/devices,soc/devices/soc?}/*/modalias; do
|
|
||||||
[[ -e $i ]] || continue
|
|
||||||
- if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register" -S "iw_handler_get_spy" $(<$i); then
|
|
||||||
- if strstr "$(modinfo -F filename $(<$i) 2>/dev/null)" radeon.ko; then
|
|
||||||
+ if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register" -S "iw_handler_get_spy" $(<"$i"); then
|
|
||||||
+ if strstr "$(modinfo -F filename $(<"$i") 2>/dev/null)" radeon.ko; then
|
|
||||||
hostonly='' instmods amdkfd
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
|||||||
From 38ea7e821bce1cbf3c8fe4dc044a809301a77f82 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Tue, 22 Sep 2020 12:01:17 +0100
|
|
||||||
Subject: [PATCH] Include devfreq drivers in initrd
|
|
||||||
|
|
||||||
Some SoCs now have drivers that user devfreq in early init and fail
|
|
||||||
if the drivers are missing so make sure we have them in the initrd.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
modules.d/90kernel-modules/module-setup.sh | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
index 764675eb..3ed749c7 100755
|
|
||||||
--- a/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
+++ b/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
@@ -65,6 +65,7 @@ installkernel() {
|
|
||||||
_blockfuncs+='|dw_mc_probe|dw_mci_pltfm_register'
|
|
||||||
instmods \
|
|
||||||
"=drivers/clk" \
|
|
||||||
+ "=drivers/devfreq" \
|
|
||||||
"=drivers/dma" \
|
|
||||||
"=drivers/extcon" \
|
|
||||||
"=drivers/gpio" \
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
|||||||
From d76e9ad5d7b16edb3c544ed3888640bea0efbf72 Mon Sep 17 00:00:00 2001
|
|
||||||
From: GuoChuang <guo.chuang@zte.com.cn>
|
|
||||||
Date: Mon, 24 Aug 2020 14:03:48 +0800
|
|
||||||
Subject: [PATCH 1/8] fix graphics startup failure with the rhgb paramter in
|
|
||||||
CentOS8.2
|
|
||||||
|
|
||||||
---
|
|
||||||
modules.d/50drm/module-setup.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh
|
|
||||||
index 08cfa45b..c69b2cfa 100755
|
|
||||||
--- a/modules.d/50drm/module-setup.sh
|
|
||||||
+++ b/modules.d/50drm/module-setup.sh
|
|
||||||
@@ -33,7 +33,7 @@ installkernel() {
|
|
||||||
if [[ $hostonly ]]; then
|
|
||||||
for i in /sys/bus/{pci/devices,virtio/devices,soc/devices/soc?}/*/modalias; do
|
|
||||||
[[ -e $i ]] || continue
|
|
||||||
- if hostonly="" dracut_instmods --silent -s "drm_crtc_init" -S "iw_handler_get_spy" $(<$i); then
|
|
||||||
+ if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register" -S "iw_handler_get_spy" $(<$i); then
|
|
||||||
if strstr "$(modinfo -F filename $(<$i) 2>/dev/null)" radeon.ko; then
|
|
||||||
hostonly='' instmods amdkfd
|
|
||||||
fi
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
40
0001.patch
40
0001.patch
@ -1,27 +1,23 @@
|
|||||||
From 3ba12b22491de49853685bec5bb345e624c119ab Mon Sep 17 00:00:00 2001
|
From f634448b293ed232009b25c824f6dcd66961426f Mon Sep 17 00:00:00 2001
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
|
||||||
Date: Wed, 4 Mar 2020 14:39:22 +0100
|
Date: Fri, 14 May 2021 13:46:23 +0000
|
||||||
Subject: [PATCH] test/TEST-35-ISCSI-MULTI: bump disk space
|
Subject: [PATCH] fix(packit): downstream has renamed the master branch to main
|
||||||
|
|
||||||
---
|
---
|
||||||
test/TEST-35-ISCSI-MULTI/test.sh | 6 +++---
|
.packit.yml | 2 +-
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh
|
diff --git a/.packit.yml b/.packit.yml
|
||||||
index e96c9c56..740ab918 100755
|
index 8a995efe..482b4c4d 100644
|
||||||
--- a/test/TEST-35-ISCSI-MULTI/test.sh
|
--- a/.packit.yml
|
||||||
+++ b/test/TEST-35-ISCSI-MULTI/test.sh
|
+++ b/.packit.yml
|
||||||
@@ -144,9 +144,9 @@ test_setup() {
|
@@ -33,7 +33,7 @@ jobs:
|
||||||
fi
|
- job: propose_downstream
|
||||||
|
trigger: release
|
||||||
|
metadata:
|
||||||
|
- dist_git_branches: master
|
||||||
|
+ dist_git_branches: main
|
||||||
|
|
||||||
# Create the blank file to use as a root filesystem
|
- job: tests
|
||||||
- dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=45
|
trigger: pull_request
|
||||||
- dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=45
|
|
||||||
- dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=45
|
|
||||||
+ dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=90
|
|
||||||
+ dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=90
|
|
||||||
+ dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=90
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
|
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
From 5afd3cfc96aac425f7de23de60b94ab88dc189ee Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nicolas Chauvet <kwizart@gmail.com>
|
|
||||||
Date: Sat, 26 Sep 2020 13:15:55 +0200
|
|
||||||
Subject: [PATCH 2/3] 50drm: Include drm platform drivers in hostonly
|
|
||||||
|
|
||||||
On arm, many drm drivers are located in the plaform bus.
|
|
||||||
|
|
||||||
Adding the platform bus will allow drm drivers to be included in the
|
|
||||||
initramfs when using hostonly mode.
|
|
||||||
|
|
||||||
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
|
|
||||||
---
|
|
||||||
modules.d/50drm/module-setup.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh
|
|
||||||
index 81d2e662..ad0e6d80 100755
|
|
||||||
--- a/modules.d/50drm/module-setup.sh
|
|
||||||
+++ b/modules.d/50drm/module-setup.sh
|
|
||||||
@@ -31,7 +31,7 @@ installkernel() {
|
|
||||||
# as we could e.g. be in the installer; nokmsboot boot parameter will disable
|
|
||||||
# loading of the driver if needed
|
|
||||||
if [[ $hostonly ]]; then
|
|
||||||
- for i in /sys/bus/{pci/devices,virtio/devices,soc/devices/soc?}/*/modalias; do
|
|
||||||
+ for i in /sys/bus/{pci/devices,platform/devices,virtio/devices,soc/devices/soc?}/*/modalias; do
|
|
||||||
[[ -e $i ]] || continue
|
|
||||||
if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register" -S "iw_handler_get_spy" $(<"$i"); then
|
|
||||||
if strstr "$(modinfo -F filename $(<"$i") 2>/dev/null)" radeon.ko; then
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
49
0002.patch
49
0002.patch
@ -1,33 +1,24 @@
|
|||||||
From 9e68789d66a6a383e5c46f687350897705c7994f Mon Sep 17 00:00:00 2001
|
From b9b6f0ee5b859a562e46a8c4e0dee0261fabf74d Mon Sep 17 00:00:00 2001
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||||
Date: Wed, 4 Mar 2020 14:39:39 +0100
|
Date: Fri, 14 May 2021 16:00:27 +0200
|
||||||
Subject: [PATCH] dracut.spec: add version check for deprecated files
|
Subject: [PATCH] fix(dracut-util): print error message with trailing newline
|
||||||
|
|
||||||
|
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||||
---
|
---
|
||||||
dracut.spec | 5 ++---
|
src/util/util.c | 2 +-
|
||||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/dracut.spec b/dracut.spec
|
diff --git a/src/util/util.c b/src/util/util.c
|
||||||
index e336a25c..03b41471 100644
|
index 8ae06d6c..b3498df6 100644
|
||||||
--- a/dracut.spec
|
--- a/src/util/util.c
|
||||||
+++ b/dracut.spec
|
+++ b/src/util/util.c
|
||||||
@@ -278,8 +278,7 @@ rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1*
|
@@ -123,7 +123,7 @@ static void usage(enum EXEC_MODE enumExecMode, int ret, char *msg)
|
||||||
echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
|
{
|
||||||
echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
switch (enumExecMode) {
|
||||||
|
case UNDEFINED:
|
||||||
-%if 0%{?fedora} || 0%{?rhel}
|
- fprintf(stderr, "ERROR: 'dracut-util' has to be called via a symlink to the tool name.");
|
||||||
-# FIXME: remove after F30
|
+ fprintf(stderr, "ERROR: 'dracut-util' has to be called via a symlink to the tool name.\n");
|
||||||
+%if 0%{?fedora} <= 30 || 0%{?rhel} <= 8
|
break;
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
|
case GETARG:
|
||||||
install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
|
fprintf(stderr, "ERROR: %s\nUsage: dracut-getarg <KEY>[=[<VALUE>]]\n", msg);
|
||||||
%endif
|
|
||||||
@@ -475,7 +474,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|
||||||
%files config-rescue
|
|
||||||
%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
|
||||||
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
|
|
||||||
-%if 0%{?fedora} || 0%{?rhel}
|
|
||||||
+%if 0%{?fedora} <= 30 || 0%{?rhel} <= 8
|
|
||||||
# FIXME: remove after F30
|
|
||||||
%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
@ -1,39 +0,0 @@
|
|||||||
From dee4f26adcfd9a9a0e4664f0dc22974b60b5eea2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nicolas Chauvet <kwizart@gmail.com>
|
|
||||||
Date: Sat, 26 Sep 2020 15:01:55 +0200
|
|
||||||
Subject: [PATCH 3/3] 50drm: Check drm_encoder_init along drm_crtc_init
|
|
||||||
|
|
||||||
Some modules are involved in the display output without to rely on
|
|
||||||
drm_crtc_init.
|
|
||||||
|
|
||||||
This is the case for the meson_dw_hdmi. This module need to be included
|
|
||||||
into the initramfs in both hostonly and generic modes.
|
|
||||||
|
|
||||||
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
|
|
||||||
---
|
|
||||||
modules.d/50drm/module-setup.sh | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh
|
|
||||||
index ad0e6d80..ddc1223d 100755
|
|
||||||
--- a/modules.d/50drm/module-setup.sh
|
|
||||||
+++ b/modules.d/50drm/module-setup.sh
|
|
||||||
@@ -33,13 +33,13 @@ installkernel() {
|
|
||||||
if [[ $hostonly ]]; then
|
|
||||||
for i in /sys/bus/{pci/devices,platform/devices,virtio/devices,soc/devices/soc?}/*/modalias; do
|
|
||||||
[[ -e $i ]] || continue
|
|
||||||
- if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register" -S "iw_handler_get_spy" $(<"$i"); then
|
|
||||||
+ if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register|drm_encoder_init" -S "iw_handler_get_spy" $(<"$i"); then
|
|
||||||
if strstr "$(modinfo -F filename $(<"$i") 2>/dev/null)" radeon.ko; then
|
|
||||||
hostonly='' instmods amdkfd
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
else
|
|
||||||
- dracut_instmods -o -s "drm_crtc_init|drm_dev_register" "=drivers/gpu/drm" "=drivers/staging"
|
|
||||||
+ dracut_instmods -o -s "drm_crtc_init|drm_dev_register|drm_encoder_init" "=drivers/gpu/drm" "=drivers/staging"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
607
0003.patch
607
0003.patch
@ -1,76 +1,555 @@
|
|||||||
From eb8a7a96351b6e1cfd9dc34f1e854333a8f4a4e0 Mon Sep 17 00:00:00 2001
|
From c08bc8109d4c43beacfa4bcdc20a356102da6d02 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
|
From: Harald Hoyer <harald@redhat.com>
|
||||||
<congdanhqx@gmail.com>
|
Date: Mon, 17 May 2021 11:00:22 +0200
|
||||||
Date: Fri, 6 Mar 2020 08:46:36 +0700
|
Subject: [PATCH] fix(base): split out `dracut-dev-lib.sh`
|
||||||
Subject: [PATCH] Makefile: merge main-version and git-version earlier
|
|
||||||
|
|
||||||
With GNU Make 4.3 on both ArchLinux, and VoidLinux,
|
To share the `wait_for_dev` function and use it without side effects on
|
||||||
GITVERION is always empty because of bad substitution.
|
install time, split out the needed functions in an extra library.
|
||||||
Change '\#' to simply '#' can fix it,
|
|
||||||
but we don't need that complation.
|
|
||||||
|
|
||||||
We can merge DRACUT_MAIN_VERSION and GITVERSION into DRACUT_FULL_VERSION.
|
|
||||||
Because, GITVERSION will be attached back to DRACUT_MAIN_VERSION in all
|
|
||||||
situation.
|
|
||||||
|
|
||||||
While we're at it, detect if we're in git worktree by:
|
|
||||||
limiting GIT_CEILING_DIRECTORIES to parent directory of
|
|
||||||
dracut's top level directory; instead of checking for .git directory,
|
|
||||||
in order to support git-worktree, in such case, .git will be a file, see
|
|
||||||
gitrepository-layout(5)
|
|
||||||
---
|
---
|
||||||
Makefile | 13 +++++++------
|
modules.d/99base/dracut-dev-lib.sh | 119 +++++++++++++++++++++++++++++++++++++
|
||||||
1 file changed, 7 insertions(+), 6 deletions(-)
|
modules.d/99base/dracut-lib.sh | 115 +----------------------------------
|
||||||
|
modules.d/99base/module-setup.sh | 9 ++-
|
||||||
|
test/TEST-01-BASIC/test.sh | 1 +
|
||||||
|
test/TEST-02-SYSTEMD/test.sh | 1 +
|
||||||
|
test/TEST-03-USR-MOUNT/test.sh | 1 +
|
||||||
|
test/TEST-04-FULL-SYSTEMD/test.sh | 1 +
|
||||||
|
test/TEST-10-RAID/test.sh | 1 +
|
||||||
|
test/TEST-11-LVM/test.sh | 1 +
|
||||||
|
test/TEST-12-RAID-DEG/test.sh | 1 +
|
||||||
|
test/TEST-13-ENC-RAID-LVM/test.sh | 1 +
|
||||||
|
test/TEST-14-IMSM/test.sh | 1 +
|
||||||
|
test/TEST-15-BTRFSRAID/test.sh | 1 +
|
||||||
|
test/TEST-16-DMSQUASH/test.sh | 1 +
|
||||||
|
test/TEST-17-LVM-THIN/test.sh | 1 +
|
||||||
|
test/TEST-20-NFS/test.sh | 1 +
|
||||||
|
test/TEST-30-ISCSI/test.sh | 1 +
|
||||||
|
test/TEST-35-ISCSI-MULTI/test.sh | 1 +
|
||||||
|
test/TEST-40-NBD/test.sh | 2 +
|
||||||
|
test/TEST-50-MULTINIC/test.sh | 1 +
|
||||||
|
test/TEST-98-GETARG/test.sh | 2 +
|
||||||
|
21 files changed, 145 insertions(+), 118 deletions(-)
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/modules.d/99base/dracut-dev-lib.sh b/modules.d/99base/dracut-dev-lib.sh
|
||||||
index 22b584f1..c69e2dfc 100644
|
new file mode 100755
|
||||||
--- a/Makefile
|
index 00000000..5083f4f2
|
||||||
+++ b/Makefile
|
--- /dev/null
|
||||||
@@ -1,8 +1,9 @@
|
+++ b/modules.d/99base/dracut-dev-lib.sh
|
||||||
-include dracut-version.sh
|
@@ -0,0 +1,119 @@
|
||||||
|
+#!/bin/sh
|
||||||
|
+
|
||||||
|
+# get a systemd-compatible unit name from a path
|
||||||
|
+# (mimicks unit_name_from_path_instance())
|
||||||
|
+dev_unit_name() {
|
||||||
|
+ local dev="$1"
|
||||||
|
+
|
||||||
|
+ if command -v systemd-escape > /dev/null; then
|
||||||
|
+ systemd-escape -p -- "$dev"
|
||||||
|
+ return $?
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ "$dev" = "/" -o -z "$dev" ]; then
|
||||||
|
+ printf -- "-"
|
||||||
|
+ return 0
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ dev="${1%%/}"
|
||||||
|
+ dev="${dev##/}"
|
||||||
|
+ # shellcheck disable=SC1003
|
||||||
|
+ dev="$(str_replace "$dev" '\' '\x5c')"
|
||||||
|
+ dev="$(str_replace "$dev" '-' '\x2d')"
|
||||||
|
+ if [ "${dev##.}" != "$dev" ]; then
|
||||||
|
+ dev="\x2e${dev##.}"
|
||||||
|
+ fi
|
||||||
|
+ dev="$(str_replace "$dev" '/' '-')"
|
||||||
|
+
|
||||||
|
+ printf -- "%s" "$dev"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# set_systemd_timeout_for_dev [-n] <dev> [<timeout>]
|
||||||
|
+# Set 'rd.timeout' as the systemd timeout for <dev>
|
||||||
|
+set_systemd_timeout_for_dev() {
|
||||||
|
+ local _name
|
||||||
|
+ local _needreload
|
||||||
|
+ local _noreload
|
||||||
|
+ local _timeout
|
||||||
|
+
|
||||||
|
+ [ -z "$DRACUT_SYSTEMD" ] && return 0
|
||||||
|
+
|
||||||
|
+ if [ "$1" = "-n" ]; then
|
||||||
|
+ _noreload=1
|
||||||
|
+ shift
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -n "$2" ]; then
|
||||||
|
+ _timeout="$2"
|
||||||
|
+ else
|
||||||
|
+ _timeout=$(getarg rd.timeout)
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ _timeout=${_timeout:-0}
|
||||||
|
+
|
||||||
|
+ _name=$(dev_unit_name "$1")
|
||||||
|
+ if ! [ -L "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device" ]; then
|
||||||
|
+ [ -d "${PREFIX}"/etc/systemd/system/initrd.target.wants ] || mkdir -p "${PREFIX}"/etc/systemd/system/initrd.target.wants
|
||||||
|
+ ln -s ../"${_name}".device "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device"
|
||||||
|
+ type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/initrd.target.wants/"${_name}".device
|
||||||
|
+ _needreload=1
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if ! [ -f "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf" ]; then
|
||||||
|
+ mkdir -p "${PREFIX}/etc/systemd/system/${_name}.device.d"
|
||||||
|
+ {
|
||||||
|
+ echo "[Unit]"
|
||||||
|
+ echo "JobTimeoutSec=$_timeout"
|
||||||
|
+ echo "JobRunningTimeoutSec=$_timeout"
|
||||||
|
+ } > "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf"
|
||||||
|
+ type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/"${_name}".device.d/timeout.conf
|
||||||
|
+ _needreload=1
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -z "$PREFIX" ] && [ "$_needreload" = 1 ] && [ -z "$_noreload" ]; then
|
||||||
|
+ /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
|
||||||
|
+ fi
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# wait_for_dev <dev> [<timeout>]
|
||||||
|
+#
|
||||||
|
+# Installs a initqueue-finished script,
|
||||||
|
+# which will cause the main loop only to exit,
|
||||||
|
+# if the device <dev> is recognized by the system.
|
||||||
|
+wait_for_dev() {
|
||||||
|
+ local _name
|
||||||
|
+ local _noreload
|
||||||
|
+
|
||||||
|
+ if [ "$1" = "-n" ]; then
|
||||||
|
+ _noreload=-n
|
||||||
|
+ shift
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ _name="$(str_replace "$1" '/' '\x2f')"
|
||||||
|
+
|
||||||
|
+ type mark_hostonly > /dev/null 2>&1 && mark_hostonly "$hookdir/initqueue/finished/devexists-${_name}.sh"
|
||||||
|
+
|
||||||
|
+ [ -e "${PREFIX}$hookdir/initqueue/finished/devexists-${_name}.sh" ] && return 0
|
||||||
|
+
|
||||||
|
+ printf '[ -e "%s" ]\n' "$1" \
|
||||||
|
+ >> "${PREFIX}$hookdir/initqueue/finished/devexists-${_name}.sh"
|
||||||
|
+ {
|
||||||
|
+ printf '[ -e "%s" ] || ' "$1"
|
||||||
|
+ printf 'warn "\"%s\" does not exist"\n' "$1"
|
||||||
|
+ } >> "${PREFIX}$hookdir/emergency/80-${_name}.sh"
|
||||||
|
+
|
||||||
|
+ set_systemd_timeout_for_dev $_noreload "$@"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+cancel_wait_for_dev() {
|
||||||
|
+ local _name
|
||||||
|
+ _name="$(str_replace "$1" '/' '\x2f')"
|
||||||
|
+ rm -f -- "$hookdir/initqueue/finished/devexists-${_name}.sh"
|
||||||
|
+ rm -f -- "$hookdir/emergency/80-${_name}.sh"
|
||||||
|
+ if [ -n "$DRACUT_SYSTEMD" ]; then
|
||||||
|
+ _name=$(dev_unit_name "$1")
|
||||||
|
+ rm -f -- "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device"
|
||||||
|
+ rm -f -- "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf"
|
||||||
|
+ /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
|
||||||
|
+ fi
|
||||||
|
+}
|
||||||
|
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
||||||
|
index c35658fa..dc94e93f 100755
|
||||||
|
--- a/modules.d/99base/dracut-lib.sh
|
||||||
|
+++ b/modules.d/99base/dracut-lib.sh
|
||||||
|
@@ -1,5 +1,7 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
-DRACUT_MAIN_VERSION ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags --always 2>/dev/null || :)
|
+type wait_for_dev > /dev/null 2>&1 || . /lib/dracut-dev-lib.sh
|
||||||
+DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
|
+
|
||||||
DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
|
export DRACUT_SYSTEMD
|
||||||
-GITVERSION ?= $(shell [ -d .git ] && { v=$$(git describe --tags --always 2>/dev/null); [ -n "$$v" ] && [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
|
export NEWROOT
|
||||||
+DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
|
if [ -n "$NEWROOT" ]; then
|
||||||
+DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
|
@@ -838,119 +840,6 @@ wait_for_mount() {
|
||||||
|
} >> "$hookdir/emergency/90-${_name}.sh"
|
||||||
|
}
|
||||||
|
|
||||||
-include Makefile.inc
|
-# get a systemd-compatible unit name from a path
|
||||||
|
-# (mimicks unit_name_from_path_instance())
|
||||||
|
-dev_unit_name() {
|
||||||
|
- local dev="$1"
|
||||||
|
-
|
||||||
|
- if command -v systemd-escape > /dev/null; then
|
||||||
|
- systemd-escape -p -- "$dev"
|
||||||
|
- return
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- if [ "$dev" = "/" -o -z "$dev" ]; then
|
||||||
|
- printf -- "-"
|
||||||
|
- exit 0
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- dev="${1%%/}"
|
||||||
|
- dev="${dev##/}"
|
||||||
|
- # shellcheck disable=SC1003
|
||||||
|
- dev="$(str_replace "$dev" '\' '\x5c')"
|
||||||
|
- dev="$(str_replace "$dev" '-' '\x2d')"
|
||||||
|
- if [ "${dev##.}" != "$dev" ]; then
|
||||||
|
- dev="\x2e${dev##.}"
|
||||||
|
- fi
|
||||||
|
- dev="$(str_replace "$dev" '/' '-')"
|
||||||
|
-
|
||||||
|
- printf -- "%s" "$dev"
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-# set_systemd_timeout_for_dev <dev>
|
||||||
|
-# Set 'rd.timeout' as the systemd timeout for <dev>
|
||||||
|
-
|
||||||
|
-set_systemd_timeout_for_dev() {
|
||||||
|
- local _name
|
||||||
|
- local _needreload
|
||||||
|
- local _noreload
|
||||||
|
- local _timeout
|
||||||
|
-
|
||||||
|
- if [ "$1" = "-n" ]; then
|
||||||
|
- _noreload=1
|
||||||
|
- shift
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- _timeout=$(getarg rd.timeout)
|
||||||
|
- _timeout=${_timeout:-0}
|
||||||
|
-
|
||||||
|
- if [ -n "$DRACUT_SYSTEMD" ]; then
|
||||||
|
- _name=$(dev_unit_name "$1")
|
||||||
|
- if ! [ -L "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device" ]; then
|
||||||
|
- [ -d "${PREFIX}"/etc/systemd/system/initrd.target.wants ] || mkdir -p "${PREFIX}"/etc/systemd/system/initrd.target.wants
|
||||||
|
- ln -s ../"${_name}".device "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device"
|
||||||
|
- type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/initrd.target.wants/"${_name}".device
|
||||||
|
- _needreload=1
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- if ! [ -f "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf" ]; then
|
||||||
|
- mkdir -p "${PREFIX}/etc/systemd/system/${_name}.device.d"
|
||||||
|
- {
|
||||||
|
- echo "[Unit]"
|
||||||
|
- echo "JobTimeoutSec=$_timeout"
|
||||||
|
- echo "JobRunningTimeoutSec=$_timeout"
|
||||||
|
- } > "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf"
|
||||||
|
- type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/"${_name}".device.d/timeout.conf
|
||||||
|
- _needreload=1
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- if [ -z "$PREFIX" ] && [ "$_needreload" = 1 ] && [ -z "$_noreload" ]; then
|
||||||
|
- /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
-}
|
||||||
|
-# wait_for_dev <dev>
|
||||||
|
-#
|
||||||
|
-# Installs a initqueue-finished script,
|
||||||
|
-# which will cause the main loop only to exit,
|
||||||
|
-# if the device <dev> is recognized by the system.
|
||||||
|
-wait_for_dev() {
|
||||||
|
- local _name
|
||||||
|
- local _noreload
|
||||||
|
-
|
||||||
|
- if [ "$1" = "-n" ]; then
|
||||||
|
- _noreload=-n
|
||||||
|
- shift
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- _name="$(str_replace "$1" '/' '\x2f')"
|
||||||
|
-
|
||||||
|
- type mark_hostonly > /dev/null 2>&1 && mark_hostonly "$hookdir/initqueue/finished/devexists-${_name}.sh"
|
||||||
|
-
|
||||||
|
- [ -e "${PREFIX}$hookdir/initqueue/finished/devexists-${_name}.sh" ] && return 0
|
||||||
|
-
|
||||||
|
- printf '[ -e "%s" ]\n' "$1" \
|
||||||
|
- >> "${PREFIX}$hookdir/initqueue/finished/devexists-${_name}.sh"
|
||||||
|
- {
|
||||||
|
- printf '[ -e "%s" ] || ' "$1"
|
||||||
|
- printf 'warn "\"%s\" does not exist"\n' "$1"
|
||||||
|
- } >> "${PREFIX}$hookdir/emergency/80-${_name}.sh"
|
||||||
|
-
|
||||||
|
- set_systemd_timeout_for_dev $_noreload "$1"
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-cancel_wait_for_dev() {
|
||||||
|
- local _name
|
||||||
|
- _name="$(str_replace "$1" '/' '\x2f')"
|
||||||
|
- rm -f -- "$hookdir/initqueue/finished/devexists-${_name}.sh"
|
||||||
|
- rm -f -- "$hookdir/emergency/80-${_name}.sh"
|
||||||
|
- if [ -n "$DRACUT_SYSTEMD" ]; then
|
||||||
|
- _name=$(dev_unit_name "$1")
|
||||||
|
- rm -f -- "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device"
|
||||||
|
- rm -f -- "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf"
|
||||||
|
- /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
|
||||||
|
- fi
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
killproc() {
|
||||||
|
debug_off
|
||||||
|
local _exe
|
||||||
|
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
|
||||||
|
index a52c643e..7eb0a277 100755
|
||||||
|
--- a/modules.d/99base/module-setup.sh
|
||||||
|
+++ b/modules.d/99base/module-setup.sh
|
||||||
|
@@ -50,6 +50,7 @@ install() {
|
||||||
|
mkdir -p "${initdir}"/tmp
|
||||||
|
|
||||||
@@ -92,14 +93,14 @@ endif
|
inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "$moddir/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
mkdir -p "${initdir}"/var
|
||||||
|
|
||||||
%.xml: %.asc
|
if ! dracut_module_included "systemd"; then
|
||||||
@rm -f -- "$@"
|
@@ -117,10 +118,8 @@ install() {
|
||||||
- asciidoc -a "version=$(DRACUT_MAIN_VERSION)$(GITVERSION)" -d manpage -b docbook -o "$@" $<
|
fi
|
||||||
+ asciidoc -a "version=$(DRACUT_FULL_VERSION)" -d manpage -b docbook -o "$@" $<
|
export PREFIX="$initdir"
|
||||||
|
|
||||||
dracut.8: dracut.usage.asc dracut.8.asc
|
- # suppress getarg for `rd.memdebug`
|
||||||
|
- export DEBUG_MEM_LEVEL=0
|
||||||
|
- # shellcheck source=dracut-lib.sh
|
||||||
|
- . "$moddir/dracut-lib.sh"
|
||||||
|
+ # shellcheck source=dracut-dev-lib.sh
|
||||||
|
+ . "$moddir/dracut-dev-lib.sh"
|
||||||
|
|
||||||
dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
|
for _dev in "${host_devs[@]}"; do
|
||||||
@rm -f -- dracut.xml
|
for _dev2 in "${root_devs[@]}"; do
|
||||||
asciidoc -a "mainversion=$(DRACUT_MAIN_VERSION)" \
|
@@ -137,7 +136,7 @@ install() {
|
||||||
- -a "version=$(DRACUT_MAIN_VERSION)$(GITVERSION)" \
|
_pdev=$(get_persistent_dev "$_dev")
|
||||||
+ -a "version=$(DRACUT_FULL_VERSION)" \
|
|
||||||
-a numbered \
|
|
||||||
-d book -b docbook -o dracut.xml dracut.asc
|
|
||||||
@rm -f -- dracut.html
|
|
||||||
@@ -112,7 +113,7 @@ dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
|
|
||||||
dracut.pc: Makefile.inc Makefile
|
|
||||||
@echo "Name: dracut" > dracut.pc
|
|
||||||
@echo "Description: dracut" >> dracut.pc
|
|
||||||
- @echo "Version: $(DRACUT_MAIN_VERSION)$(GITVERSION)" >> dracut.pc
|
|
||||||
+ @echo "Version: $(DRACUT_FULL_VERSION)" >> dracut.pc
|
|
||||||
@echo "dracutdir=$(pkglibdir)" >> dracut.pc
|
|
||||||
@echo "dracutmodulesdir=$(pkglibdir)/modules.d" >> dracut.pc
|
|
||||||
@echo "dracutconfdir=$(pkglibdir)/dracut.conf.d" >> dracut.pc
|
|
||||||
@@ -182,7 +183,7 @@ endif
|
|
||||||
|
|
||||||
dracut-version.sh:
|
case "$_pdev" in
|
||||||
@rm -f dracut-version.sh
|
- /dev/?*) wait_for_dev "$_pdev" ;;
|
||||||
- @echo "DRACUT_VERSION=$(DRACUT_MAIN_VERSION)$(GITVERSION)" > dracut-version.sh
|
+ /dev/?*) wait_for_dev "$_pdev" 0 ;;
|
||||||
+ @echo "DRACUT_VERSION=$(DRACUT_FULL_VERSION)" > dracut-version.sh
|
*) ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
|
||||||
|
index 7ac2a8b9..012f2e5a 100755
|
||||||
|
--- a/test/TEST-01-BASIC/test.sh
|
||||||
|
+++ b/test/TEST-01-BASIC/test.sh
|
||||||
|
@@ -49,6 +49,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
clean:
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
$(RM) *~
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
|
||||||
|
index a8185b09..8b6b5930 100755
|
||||||
|
--- a/test/TEST-02-SYSTEMD/test.sh
|
||||||
|
+++ b/test/TEST-02-SYSTEMD/test.sh
|
||||||
|
@@ -48,6 +48,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
|
||||||
|
index 13361173..3bb7fab7 100755
|
||||||
|
--- a/test/TEST-03-USR-MOUNT/test.sh
|
||||||
|
+++ b/test/TEST-03-USR-MOUNT/test.sh
|
||||||
|
@@ -69,6 +69,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
|
||||||
|
index 9b8fab24..38cb1464 100755
|
||||||
|
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
|
||||||
|
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
|
||||||
|
@@ -93,6 +93,7 @@ test_setup() {
|
||||||
|
inst_multiple -o {,/usr}/lib/systemd/system/"dracut*"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
|
||||||
|
index f03d2952..918d2a71 100755
|
||||||
|
--- a/test/TEST-10-RAID/test.sh
|
||||||
|
+++ b/test/TEST-10-RAID/test.sh
|
||||||
|
@@ -46,6 +46,7 @@ test_setup() {
|
||||||
|
inst_multiple -o ${_terminfodir}/l/linux
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
|
||||||
|
index e44b21ff..12384c09 100755
|
||||||
|
--- a/test/TEST-11-LVM/test.sh
|
||||||
|
+++ b/test/TEST-11-LVM/test.sh
|
||||||
|
@@ -50,6 +50,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
|
||||||
|
index 8d56f658..beb81381 100755
|
||||||
|
--- a/test/TEST-12-RAID-DEG/test.sh
|
||||||
|
+++ b/test/TEST-12-RAID-DEG/test.sh
|
||||||
|
@@ -80,6 +80,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
|
||||||
|
index 2d76c982..968eafe7 100755
|
||||||
|
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
|
||||||
|
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
|
||||||
|
@@ -78,6 +78,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
|
||||||
|
index ab4f8119..78b087f5 100755
|
||||||
|
--- a/test/TEST-14-IMSM/test.sh
|
||||||
|
+++ b/test/TEST-14-IMSM/test.sh
|
||||||
|
@@ -75,6 +75,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
|
||||||
|
index 75e97703..47edac81 100755
|
||||||
|
--- a/test/TEST-15-BTRFSRAID/test.sh
|
||||||
|
+++ b/test/TEST-15-BTRFSRAID/test.sh
|
||||||
|
@@ -53,6 +53,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
|
||||||
|
index 73c4c7f1..2a68f305 100755
|
||||||
|
--- a/test/TEST-16-DMSQUASH/test.sh
|
||||||
|
+++ b/test/TEST-16-DMSQUASH/test.sh
|
||||||
|
@@ -88,6 +88,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
|
||||||
|
index 6f6886ec..7dbcca51 100755
|
||||||
|
--- a/test/TEST-17-LVM-THIN/test.sh
|
||||||
|
+++ b/test/TEST-17-LVM-THIN/test.sh
|
||||||
|
@@ -48,6 +48,7 @@ test_setup() {
|
||||||
|
inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
|
||||||
|
index dc9fa0b0..0be60a80 100755
|
||||||
|
--- a/test/TEST-20-NFS/test.sh
|
||||||
|
+++ b/test/TEST-20-NFS/test.sh
|
||||||
|
@@ -320,6 +320,7 @@ test_setup() {
|
||||||
|
done
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
|
||||||
|
index e1d10265..5f0063f8 100755
|
||||||
|
--- a/test/TEST-30-ISCSI/test.sh
|
||||||
|
+++ b/test/TEST-30-ISCSI/test.sh
|
||||||
|
@@ -162,6 +162,7 @@ test_setup() {
|
||||||
|
inst_simple /etc/os-release
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh
|
||||||
|
index 09b939ab..628131e0 100755
|
||||||
|
--- a/test/TEST-35-ISCSI-MULTI/test.sh
|
||||||
|
+++ b/test/TEST-35-ISCSI-MULTI/test.sh
|
||||||
|
@@ -174,6 +174,7 @@ test_setup() {
|
||||||
|
inst_simple /etc/os-release
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
|
||||||
|
index df1bcb2f..178dff40 100755
|
||||||
|
--- a/test/TEST-40-NBD/test.sh
|
||||||
|
+++ b/test/TEST-40-NBD/test.sh
|
||||||
|
@@ -219,6 +219,7 @@ make_encrypted_root() {
|
||||||
|
inst_multiple -o ${_terminfodir}/l/linux
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
@@ -299,6 +300,7 @@ make_client_root() {
|
||||||
|
inst_multiple -o ${_terminfodir}/l/linux
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
|
||||||
|
index e96cef7c..81b1f685 100755
|
||||||
|
--- a/test/TEST-50-MULTINIC/test.sh
|
||||||
|
+++ b/test/TEST-50-MULTINIC/test.sh
|
||||||
|
@@ -270,6 +270,7 @@ test_setup() {
|
||||||
|
done
|
||||||
|
|
||||||
|
inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
|
||||||
|
+ inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
|
||||||
|
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
|
||||||
|
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
|
||||||
|
diff --git a/test/TEST-98-GETARG/test.sh b/test/TEST-98-GETARG/test.sh
|
||||||
|
index 9a00470b..012396ba 100755
|
||||||
|
--- a/test/TEST-98-GETARG/test.sh
|
||||||
|
+++ b/test/TEST-98-GETARG/test.sh
|
||||||
|
@@ -15,6 +15,7 @@ test_setup() {
|
||||||
|
ln -sfnr "$basedir"/dracut-util "$TESTDIR"/dracut-getarg
|
||||||
|
ln -sfnr "$basedir"/dracut-util "$TESTDIR"/dracut-getargs
|
||||||
|
ln -sfnr "$basedir"/modules.d/99base/dracut-lib.sh "$TESTDIR"/dracut-lib.sh
|
||||||
|
+ ln -sfnr "$basedir"/modules.d/99base/dracut-dev-lib.sh "$TESTDIR"/dracut-dev-lib.sh
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -85,6 +86,7 @@ test_run() {
|
||||||
|
|
||||||
|
export PATH=".:$PATH"
|
||||||
|
|
||||||
|
+ . dracut-dev-lib.sh
|
||||||
|
. dracut-lib.sh
|
||||||
|
|
||||||
|
debug_off() {
|
||||||
|
|
||||||
|
82
0004.patch
82
0004.patch
@ -1,54 +1,38 @@
|
|||||||
From 7ef5ead6f4cf4834b84ea6d9546b77ddc0da394b Mon Sep 17 00:00:00 2001
|
From 7275c6f6a0f6808cd939ea5bdf1244c7bd13ba44 Mon Sep 17 00:00:00 2001
|
||||||
From: Martin Wilck <mwilck@suse.de>
|
From: Harald Hoyer <harald@redhat.com>
|
||||||
Date: Thu, 30 Jan 2020 13:48:11 +0100
|
Date: Mon, 17 May 2021 14:22:10 +0200
|
||||||
Subject: [PATCH] Add module "90nvdimm" for NVDIMM support
|
Subject: [PATCH] feat(dracut.sh): detect running in a container
|
||||||
|
|
||||||
Detection of persistent memory devices works mostly out of the box
|
Don't try to `mknod` by setting DRACUT_NO_MKNOD.
|
||||||
already. Only the "provider" modules for ndbus devices, which are responsible
|
Don't try to `cp` extended attributrs by setting DRACUT_NO_XATTR.
|
||||||
to extract information of available NVDIMM devices and their configuration
|
|
||||||
from system firmware, are only indirectly linked into the module stack.
|
|
||||||
Examples for such modules are nfit.ko, nd_e820.ko, and virtio-pmem.ko.
|
|
||||||
|
|
||||||
Add a module that resolves these dependencies.
|
|
||||||
---
|
---
|
||||||
modules.d/90nvdimm/module-setup.sh | 31 +++++++++++++++++++++++++++++++
|
dracut.sh | 9 ++++++++-
|
||||||
1 file changed, 31 insertions(+)
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/modules.d/90nvdimm/module-setup.sh b/modules.d/90nvdimm/module-setup.sh
|
diff --git a/dracut.sh b/dracut.sh
|
||||||
new file mode 100755
|
index bfb7a1ac..24e1c2e7 100755
|
||||||
index 00000000..6d58efd7
|
--- a/dracut.sh
|
||||||
--- /dev/null
|
+++ b/dracut.sh
|
||||||
+++ b/modules.d/90nvdimm/module-setup.sh
|
@@ -1171,6 +1171,13 @@ if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
||||||
@@ -0,0 +1,31 @@
|
. "$dracutbasedir"/dracut-version.sh
|
||||||
+#!/bin/bash
|
fi
|
||||||
+
|
|
||||||
+# called by dracut
|
+if systemd-detect-virt -c &> /dev/null; then
|
||||||
+check() {
|
+ export DRACUT_NO_MKNOD=1 DRACUT_NO_XATTR=1
|
||||||
+ if [[ ! $hostonly ]]; then
|
+ if [[ $hostonly ]]; then
|
||||||
+ return 0
|
+ printf "%s\n" "dracut: WARNING: running in hostonly mode in a container!!"
|
||||||
+ fi
|
+ fi
|
||||||
+ [[ $DRACUT_KERNEL_MODALIASES && -f "$DRACUT_KERNEL_MODALIASES" ]] && \
|
+fi
|
||||||
+ grep -q libnvdimm "$DRACUT_KERNEL_MODALIASES" && return 0
|
|
||||||
+ return 255
|
|
||||||
+}
|
|
||||||
+
|
+
|
||||||
+# called by dracut
|
if [[ -f $dracutbasedir/dracut-init.sh ]]; then
|
||||||
+depends() {
|
# shellcheck source=./dracut-init.sh
|
||||||
+ return 0
|
. "$dracutbasedir"/dracut-init.sh
|
||||||
+}
|
@@ -1888,7 +1895,7 @@ if [[ $kernel_only != yes ]]; then
|
||||||
+
|
# shellcheck disable=SC2174
|
||||||
+# called by dracut
|
mkdir -m 0755 -p "${initdir}/lib/dracut/hooks/$_d"
|
||||||
+installkernel() {
|
done
|
||||||
+ # Directories to search for NVDIMM "providers" (firmware drivers)
|
- if [[ $EUID == "0" ]]; then
|
||||||
+ # These modules call "nvdimm_bus_register()".
|
+ if [[ $EUID == "0" ]] && ! [[ $DRACUT_NO_MKNOD ]]; then
|
||||||
+ local _provider_dirs='=drivers/nvdimm =drivers/acpi =arch/powerpc'
|
[[ -c ${initdir}/dev/null ]] || mknod "${initdir}"/dev/null c 1 3
|
||||||
+
|
[[ -c ${initdir}/dev/kmsg ]] || mknod "${initdir}"/dev/kmsg c 1 11
|
||||||
+ #instmods() will take care of hostonly
|
[[ -c ${initdir}/dev/console ]] || mknod "${initdir}"/dev/console c 5 1
|
||||||
+ dracut_instmods -o -s nvdimm_bus_register $_provider_dirs
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+# called by dracut
|
|
||||||
+install() {
|
|
||||||
+ inst_multiple -o ndctl
|
|
||||||
+}
|
|
||||||
|
|
||||||
|
25
0005.patch
25
0005.patch
@ -1,25 +0,0 @@
|
|||||||
From 18420d9ce5bb738473d127affb96a5c6a44ba2ac Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Wilck <mwilck@suse.de>
|
|
||||||
Date: Thu, 30 Jan 2020 15:44:28 +0100
|
|
||||||
Subject: [PATCH] 90kernel-modules: remove nfit from static module list
|
|
||||||
|
|
||||||
The 90nvdimm module now resolves the nfit dependency when it's
|
|
||||||
necessary, so it's not necessary any more to pack it always.
|
|
||||||
---
|
|
||||||
modules.d/90kernel-modules/module-setup.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
index 2ca4b719..bc3810cc 100755
|
|
||||||
--- a/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
+++ b/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
@@ -28,7 +28,7 @@ installkernel() {
|
|
||||||
hostonly='' instmods sr_mod sd_mod scsi_dh ata_piix
|
|
||||||
instmods \
|
|
||||||
scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
|
|
||||||
- =ide nvme vmd nfit \
|
|
||||||
+ =ide nvme vmd \
|
|
||||||
virtio_blk
|
|
||||||
|
|
||||||
dracut_instmods -o -s "${_blockfuncs}" "=drivers"
|
|
||||||
|
|
22
0006.patch
22
0006.patch
@ -1,22 +0,0 @@
|
|||||||
From 5a720ebf6711a119649645de673bcb247e09a1ba Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Wilck <mwilck@suse.de>
|
|
||||||
Date: Fri, 6 Mar 2020 10:26:43 +0100
|
|
||||||
Subject: [PATCH] dracut.spec: add 90nvdimm
|
|
||||||
|
|
||||||
---
|
|
||||||
dracut.spec | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/dracut.spec b/dracut.spec
|
|
||||||
index 03b41471..0369dde6 100644
|
|
||||||
--- a/dracut.spec
|
|
||||||
+++ b/dracut.spec
|
|
||||||
@@ -364,6 +364,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|
||||||
%{dracutlibdir}/modules.d/90lvm
|
|
||||||
%{dracutlibdir}/modules.d/90mdraid
|
|
||||||
%{dracutlibdir}/modules.d/90multipath
|
|
||||||
+%{dracutlibdir}/modules.d/90nvdimm
|
|
||||||
%{dracutlibdir}/modules.d/90stratis
|
|
||||||
%{dracutlibdir}/modules.d/90ppcmac
|
|
||||||
%{dracutlibdir}/modules.d/90qemu
|
|
||||||
|
|
70
0007.patch
70
0007.patch
@ -1,70 +0,0 @@
|
|||||||
From db9b5851f3bca0844890d529c7560c89ef81b92a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Molkentin <daniel.molkentin@suse.com>
|
|
||||||
Date: Wed, 30 Oct 2019 09:30:32 +0100
|
|
||||||
Subject: [PATCH] 99base: Remove duplicate nfsroot_to_var from dracut-lib.sh
|
|
||||||
|
|
||||||
It already lives in nfs-lib.sh, which is the more correct library scope.
|
|
||||||
|
|
||||||
Fixes #17
|
|
||||||
---
|
|
||||||
modules.d/95nfs/parse-nfsroot.sh | 1 +
|
|
||||||
modules.d/99base/dracut-lib.sh | 33 ---------------------------------
|
|
||||||
2 files changed, 1 insertion(+), 33 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh
|
|
||||||
index f715767b..44a69d48 100755
|
|
||||||
--- a/modules.d/95nfs/parse-nfsroot.sh
|
|
||||||
+++ b/modules.d/95nfs/parse-nfsroot.sh
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#
|
|
||||||
|
|
||||||
type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
|
||||||
+ . /lib/nfs-lib.sh
|
|
||||||
|
|
||||||
# This script is sourced, so root should be set. But let's be paranoid
|
|
||||||
[ -z "$root" ] && root=$(getarg root=)
|
|
||||||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
|
||||||
index 207a2b5c..c53cd13b 100755
|
|
||||||
--- a/modules.d/99base/dracut-lib.sh
|
|
||||||
+++ b/modules.d/99base/dracut-lib.sh
|
|
||||||
@@ -579,39 +579,6 @@ else
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
-# root=nfs:[<server-ip>:]<root-dir>[:<nfs-options>]
|
|
||||||
-# root=nfs4:[<server-ip>:]<root-dir>[:<nfs-options>]
|
|
||||||
-nfsroot_to_var() {
|
|
||||||
- # strip nfs[4]:
|
|
||||||
- local arg="$@:"
|
|
||||||
- nfs="${arg%%:*}"
|
|
||||||
- arg="${arg##$nfs:}"
|
|
||||||
-
|
|
||||||
- # check if we have a server
|
|
||||||
- if strstr "$arg" ':/' ; then
|
|
||||||
- server="${arg%%:/*}"
|
|
||||||
- arg="/${arg##*:/}"
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- path="${arg%%:*}"
|
|
||||||
-
|
|
||||||
- # rest are options
|
|
||||||
- options="${arg##$path}"
|
|
||||||
- # strip leading ":"
|
|
||||||
- options="${options##:}"
|
|
||||||
- # strip ":"
|
|
||||||
- options="${options%%:}"
|
|
||||||
-
|
|
||||||
- # Does it really start with '/'?
|
|
||||||
- [ -n "${path%%/*}" ] && path="error";
|
|
||||||
-
|
|
||||||
- #Fix kernel legacy style separating path and options with ','
|
|
||||||
- if [ "$path" != "${path#*,}" ] ; then
|
|
||||||
- options=${path#*,}
|
|
||||||
- path=${path%%,*}
|
|
||||||
- fi
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
# Create udev rule match for a device with its device name, or the udev property
|
|
||||||
# ID_FS_UUID or ID_FS_LABEL
|
|
||||||
#
|
|
||||||
|
|
26
0008.patch
26
0008.patch
@ -1,26 +0,0 @@
|
|||||||
From 7a04712ad0efa9afa3759656ea1b26db40a8a29e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
||||||
Date: Mon, 21 Jan 2019 14:40:06 +0100
|
|
||||||
Subject: [PATCH] 95zfcp_rules/parse-zfcp.sh: remove rule existence check
|
|
||||||
|
|
||||||
Reference: bsc#1008352
|
|
||||||
|
|
||||||
Original-Patch-By: Michal Suchanek <msuchanek@suse.com>
|
|
||||||
---
|
|
||||||
modules.d/95zfcp_rules/parse-zfcp.sh | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh
|
|
||||||
index 7defb04f..2b62012b 100755
|
|
||||||
--- a/modules.d/95zfcp_rules/parse-zfcp.sh
|
|
||||||
+++ b/modules.d/95zfcp_rules/parse-zfcp.sh
|
|
||||||
@@ -22,8 +22,6 @@ create_udev_rule() {
|
|
||||||
return 0;
|
|
||||||
fi
|
|
||||||
|
|
||||||
- [ -e ${_rule} ] && return 0
|
|
||||||
-
|
|
||||||
if [ ! -f "$_rule" ] ; then
|
|
||||||
cat > $_rule <<EOF
|
|
||||||
ACTION=="add", SUBSYSTEM=="ccw", KERNEL=="$ccw", IMPORT{program}="collect $ccw %k ${ccw} zfcp"
|
|
||||||
|
|
73
0009.patch
73
0009.patch
@ -1,73 +0,0 @@
|
|||||||
From 0386e4627779cb51f4292b3c642d90586d5e71b4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Wilck <mwilck@suse.de>
|
|
||||||
Date: Wed, 29 Jan 2020 23:53:29 +0100
|
|
||||||
Subject: [PATCH] dracut.sh: don't call fsfreeze on subvol of root file system
|
|
||||||
|
|
||||||
dracut.sh already doesn't call fsfreeze if the output file is on
|
|
||||||
the root file system. For btrfs, however, this is not sufficient.
|
|
||||||
Because fsfreeze is a superblock operation, and all btrfs subvolumes
|
|
||||||
share the same superblock, fsfreeze may freeze the entire system
|
|
||||||
if the subvolume on which the output file is written and / are
|
|
||||||
subvolumes of the same file system. Avoid this by comparing file
|
|
||||||
system UUIDs for btrfs.
|
|
||||||
|
|
||||||
Fixes: de576db3c225 ("call fsfreeze(8) on /boot to flush initramfs data & metadata to media")
|
|
||||||
---
|
|
||||||
dracut.sh | 36 +++++++++++++++++++++++++++++++++++-
|
|
||||||
1 file changed, 35 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.sh b/dracut.sh
|
|
||||||
index af346f3a..c14f6c0b 100755
|
|
||||||
--- a/dracut.sh
|
|
||||||
+++ b/dracut.sh
|
|
||||||
@@ -2075,6 +2075,40 @@ fi
|
|
||||||
|
|
||||||
command -v restorecon &>/dev/null && restorecon -- "$outfile"
|
|
||||||
|
|
||||||
+btrfs_uuid() {
|
|
||||||
+ btrfs filesystem show "$1" | sed -n '1s/^.*uuid: //p'
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+freeze_ok_for_btrfs() {
|
|
||||||
+ local mnt uuid1 uuid2
|
|
||||||
+ # If the output file is on btrfs, we need to make sure that it's
|
|
||||||
+ # not on a subvolume of the same file system as the root FS.
|
|
||||||
+ # Otherwise, fsfreeze() might freeze the entire system.
|
|
||||||
+ # This is most conveniently checked by comparing the FS uuid.
|
|
||||||
+
|
|
||||||
+ [[ "$(stat -f -c %T -- "/")" == "btrfs" ]] || return 0
|
|
||||||
+ mnt=$(stat -c %m -- "$1")
|
|
||||||
+ uuid1=$(btrfs_uuid "$mnt")
|
|
||||||
+ uuid2=$(btrfs_uuid "/")
|
|
||||||
+ [[ "$uuid1" && "$uuid2" && "$uuid1" != "$uuid2" ]]
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+freeze_ok_for_fstype() {
|
|
||||||
+ local outfile=$1
|
|
||||||
+ local fstype
|
|
||||||
+
|
|
||||||
+ [[ "$(stat -c %m -- "$outfile")" == "/" ]] && return 1
|
|
||||||
+ fstype=$(stat -f -c %T -- "$outfile")
|
|
||||||
+ case $fstype in
|
|
||||||
+ msdos)
|
|
||||||
+ return 1;;
|
|
||||||
+ btrfs)
|
|
||||||
+ freeze_ok_for_btrfs "$outfile";;
|
|
||||||
+ *)
|
|
||||||
+ return 0;;
|
|
||||||
+ esac
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
# We sync/fsfreeze only if we're operating on a live booted system.
|
|
||||||
# It's possible for e.g. `kernel` to be installed as an RPM BuildRequires or equivalent,
|
|
||||||
# and there's no reason to sync, and *definitely* no reason to fsfreeze.
|
|
||||||
@@ -2087,7 +2121,7 @@ if test -d $dracutsysrootdir/run/systemd/system; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
# use fsfreeze only if we're not writing to /
|
|
||||||
- if [[ "$(stat -c %m -- "$outfile")" != "/" && "$(stat -f -c %T -- "$outfile")" != "msdos" ]]; then
|
|
||||||
+ if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
|
|
||||||
if ! $(fsfreeze -f $(dirname "$outfile") 2>/dev/null && fsfreeze -u $(dirname "$outfile") 2>/dev/null); then
|
|
||||||
dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")"
|
|
||||||
fi
|
|
||||||
|
|
38
0010.patch
38
0010.patch
@ -1,38 +0,0 @@
|
|||||||
From bc1e69b691e6d25722b64e1df58a35e3be977801 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Topi Miettinen <toiwoton@gmail.com>
|
|
||||||
Date: Sun, 1 Mar 2020 10:45:16 +0200
|
|
||||||
Subject: [PATCH] Use TMPDIR if available
|
|
||||||
|
|
||||||
Use environment variable TMPDIR (typically /run/user/$UID) as default
|
|
||||||
temporary directory, if available. This should be more private
|
|
||||||
location than /var/tmp. Path specified with --tmpdir is takes
|
|
||||||
precedence over TMPDIR and /var/tmp is still used as last resort if
|
|
||||||
neither TMPDIR is set nor --tmpdir is used.
|
|
||||||
|
|
||||||
Signed-off-by: Topi Miettinen <toiwoton@gmail.com>
|
|
||||||
---
|
|
||||||
dracut.sh | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.sh b/dracut.sh
|
|
||||||
index c14f6c0b..ab82cbc9 100755
|
|
||||||
--- a/dracut.sh
|
|
||||||
+++ b/dracut.sh
|
|
||||||
@@ -140,7 +140,7 @@ Creates initial ramdisk images for preloading modules
|
|
||||||
--confdir [DIR] Specify configuration directory to use *.conf files
|
|
||||||
from. Default: /etc/dracut.conf.d
|
|
||||||
--tmpdir [DIR] Temporary directory to be used instead of default
|
|
||||||
- /var/tmp.
|
|
||||||
+ ${TMPDIR:-/var/tmp}.
|
|
||||||
-r, --sysroot [DIR] Specify sysroot directory to collect files from.
|
|
||||||
-l, --local Local mode. Use modules from the current working
|
|
||||||
directory instead of the system-wide installed in
|
|
||||||
@@ -765,6 +765,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
|
|
||||||
[[ $dracutbasedir ]] || dracutbasedir=$dracutsysrootdir/usr/lib/dracut
|
|
||||||
[[ $fw_dir ]] || fw_dir="$dracutsysrootdir/lib/firmware/updates:$dracutsysrootdir/lib/firmware:$dracutsysrootdir/lib/firmware/$kernel"
|
|
||||||
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
|
|
||||||
+[[ $tmpdir ]] && tmpdir="$TMPDIR"
|
|
||||||
[[ $tmpdir ]] || tmpdir=$dracutsysrootdir/var/tmp
|
|
||||||
[[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
|
|
||||||
[[ $compress_l ]] && compress=$compress_l
|
|
||||||
|
|
17
0011.patch
17
0011.patch
@ -1,17 +0,0 @@
|
|||||||
From 2293609dcba01f5bf256b4245896927d4719a273 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
||||||
Date: Tue, 24 Jul 2018 19:38:30 +0200
|
|
||||||
Subject: [PATCH] 95dcssblk: fix script permissions
|
|
||||||
|
|
||||||
---
|
|
||||||
modules.d/95dcssblk/module-setup.sh | 0
|
|
||||||
modules.d/95dcssblk/parse-dcssblk.sh | 0
|
|
||||||
2 files changed, 0 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/95dcssblk/module-setup.sh b/modules.d/95dcssblk/module-setup.sh
|
|
||||||
old mode 100644
|
|
||||||
new mode 100755
|
|
||||||
diff --git a/modules.d/95dcssblk/parse-dcssblk.sh b/modules.d/95dcssblk/parse-dcssblk.sh
|
|
||||||
old mode 100644
|
|
||||||
new mode 100755
|
|
||||||
|
|
32
0012.patch
32
0012.patch
@ -1,32 +0,0 @@
|
|||||||
From a76aa8e39016a8564adb0f18f93bbf2e15d3243f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Tsoy <alexander@tsoy.me>
|
|
||||||
Date: Sun, 8 Mar 2020 05:47:50 +0300
|
|
||||||
Subject: [PATCH] Makefile: fix VERSION again
|
|
||||||
|
|
||||||
The variable is not undefined anymore after the first assignment, so
|
|
||||||
we should check if variable is empty instead.
|
|
||||||
---
|
|
||||||
Makefile | 8 ++++++--
|
|
||||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index c69e2dfc..02e2c4b5 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -1,9 +1,13 @@
|
|
||||||
-include dracut-version.sh
|
|
||||||
|
|
||||||
DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
|
|
||||||
-DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
|
|
||||||
+ifeq ($(DRACUT_MAIN_VERSION),)
|
|
||||||
+DRACUT_MAIN_VERSION = $(DRACUT_VERSION)
|
|
||||||
+endif
|
|
||||||
DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
|
|
||||||
-DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
|
|
||||||
+ifeq ($(DRACUT_FULL_VERSION),)
|
|
||||||
+DRACUT_FULL_VERSION = $(DRACUT_VERSION)
|
|
||||||
+endif
|
|
||||||
|
|
||||||
-include Makefile.inc
|
|
||||||
|
|
||||||
|
|
26
0013.patch
26
0013.patch
@ -1,26 +0,0 @@
|
|||||||
From 7fb8f939a52a904b1860e303a6a7fe69ba0d2ceb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Radek Vykydal <rvykydal@redhat.com>
|
|
||||||
Date: Tue, 10 Mar 2020 10:48:21 +0100
|
|
||||||
Subject: [PATCH] Fix pre-trigger stage by replacing exit with return in
|
|
||||||
lldpad.sh
|
|
||||||
|
|
||||||
Using exit makes the pre-trigger stage finish after running 03-lldpad.sh
|
|
||||||
pre-trigger hook.
|
|
||||||
---
|
|
||||||
modules.d/95fcoe/lldpad.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/95fcoe/lldpad.sh b/modules.d/95fcoe/lldpad.sh
|
|
||||||
index c32feeed..444c943e 100755
|
|
||||||
--- a/modules.d/95fcoe/lldpad.sh
|
|
||||||
+++ b/modules.d/95fcoe/lldpad.sh
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
if ! getargbool 0 rd.nofcoe ; then
|
|
||||||
info "rd.nofcoe=0: skipping lldpad activation"
|
|
||||||
- exit 0
|
|
||||||
+ return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Note lldpad will stay running after switchroot, the system initscripts
|
|
||||||
|
|
39
0014.patch
39
0014.patch
@ -1,39 +0,0 @@
|
|||||||
From 8446c8f9deefcc6c47d96a128b1e9b23d8855a96 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Blume <Thomas.Blume@suse.com>
|
|
||||||
Date: Mon, 24 Feb 2020 12:11:25 +0100
|
|
||||||
Subject: [PATCH] 95fcoe: default rd.nofcoe to false
|
|
||||||
|
|
||||||
rd.nofcoe should default to false, e.g. fcoe should be enabled unless
|
|
||||||
overwritten from the command line.
|
|
||||||
The same applies for lldapd.sh.
|
|
||||||
---
|
|
||||||
modules.d/95fcoe/lldpad.sh | 2 +-
|
|
||||||
modules.d/95fcoe/parse-fcoe.sh | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/95fcoe/lldpad.sh b/modules.d/95fcoe/lldpad.sh
|
|
||||||
index 444c943e..7faa2e19 100755
|
|
||||||
--- a/modules.d/95fcoe/lldpad.sh
|
|
||||||
+++ b/modules.d/95fcoe/lldpad.sh
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
-if ! getargbool 0 rd.nofcoe ; then
|
|
||||||
+if getargbool 0 rd.nofcoe ; then
|
|
||||||
info "rd.nofcoe=0: skipping lldpad activation"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh
|
|
||||||
index 8bb55c6e..86f4331e 100755
|
|
||||||
--- a/modules.d/95fcoe/parse-fcoe.sh
|
|
||||||
+++ b/modules.d/95fcoe/parse-fcoe.sh
|
|
||||||
@@ -13,7 +13,7 @@
|
|
||||||
# fcoe=eth0:nodcb:vn2vn
|
|
||||||
# fcoe=4a:3f:4c:04:f8:d7:nodcb:fabric
|
|
||||||
|
|
||||||
-if ! getargbool 0 rd.nofcoe ; then
|
|
||||||
+if getargbool 0 rd.nofcoe ; then
|
|
||||||
info "rd.nofcoe=0: skipping fcoe"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
25
0015.patch
25
0015.patch
@ -1,25 +0,0 @@
|
|||||||
From 058739bf6941f4e96cc734fe4582abbb55baac38 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Wed, 11 Mar 2020 12:38:01 +0100
|
|
||||||
Subject: [PATCH] README.md: fix github action badge links
|
|
||||||
|
|
||||||
---
|
|
||||||
README.md | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/README.md b/README.md
|
|
||||||
index c0ee79e2..9948bf97 100644
|
|
||||||
--- a/README.md
|
|
||||||
+++ b/README.md
|
|
||||||
@@ -4,8 +4,8 @@ dracut
|
|
||||||
dracut is an event driven initramfs infrastructure.
|
|
||||||
|
|
||||||
[![Build Status](https://travis-ci.org/dracutdevs/dracut.svg?branch=master)](https://travis-ci.org/dracutdevs/dracut)
|
|
||||||
-![Fedora-30](https://github.com/dracutdevs/dracut/workflows/Fedora-30/badge.svg?branch=master)
|
|
||||||
-![Fedora-31](https://github.com/dracutdevs/dracut/workflows/Fedora-31/badge.svg?branch=master)
|
|
||||||
+[![Fedora-30](https://github.com/dracutdevs/dracut/workflows/Fedora-30/badge.svg?branch=master)](https://github.com/dracutdevs/dracut/actions?query=workflow%3AFedora-30)
|
|
||||||
+[![Fedora-31](https://github.com/dracutdevs/dracut/workflows/Fedora-31/badge.svg?branch=master)](https://github.com/dracutdevs/dracut/actions?query=workflow%3AFedora-31)
|
|
||||||
|
|
||||||
dracut (the tool) is used to create an initramfs image by copying tools
|
|
||||||
and files from an installed system and combining it with the
|
|
||||||
|
|
28
0016.patch
28
0016.patch
@ -1,28 +0,0 @@
|
|||||||
From 0402b3777b1c64bd716f588ff7457b905e98489d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Wed, 11 Mar 2020 12:56:52 +0100
|
|
||||||
Subject: [PATCH] btrfs: force preload btrfs module
|
|
||||||
|
|
||||||
fixes https://github.com/dracutdevs/dracut/issues/658
|
|
||||||
|
|
||||||
raid6_pq and xor takes time doing benchmarking
|
|
||||||
|
|
||||||
[ 3.983009] request_module fs-btrfs succeeded, but still no fs?
|
|
||||||
---
|
|
||||||
modules.d/90btrfs/module-setup.sh | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
|
|
||||||
index b0d0058b..66a254e1 100755
|
|
||||||
--- a/modules.d/90btrfs/module-setup.sh
|
|
||||||
+++ b/modules.d/90btrfs/module-setup.sh
|
|
||||||
@@ -48,5 +48,7 @@ install() {
|
|
||||||
|
|
||||||
inst_multiple -o btrfsck btrfs-zero-log
|
|
||||||
inst $(command -v btrfs) /sbin/btrfs
|
|
||||||
+ # Hack for slow machines
|
|
||||||
+ # see https://github.com/dracutdevs/dracut/issues/658
|
|
||||||
+ echo "rd.driver.pre=btrfs" > ${initdir}/etc/cmdline.d/00-btrfs.conf
|
|
||||||
}
|
|
||||||
-
|
|
||||||
|
|
39
0017.patch
39
0017.patch
@ -1,39 +0,0 @@
|
|||||||
From fc6f458c3becd55277d1ab87d1608f0fe1fccf08 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Wed, 11 Mar 2020 13:14:26 +0100
|
|
||||||
Subject: [PATCH] TEST-12-RAID-DEG/create-root.sh: more udevadm settle
|
|
||||||
|
|
||||||
---
|
|
||||||
test/TEST-12-RAID-DEG/create-root.sh | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
|
|
||||||
index c210b582..f40d2500 100755
|
|
||||||
--- a/test/TEST-12-RAID-DEG/create-root.sh
|
|
||||||
+++ b/test/TEST-12-RAID-DEG/create-root.sh
|
|
||||||
@@ -20,7 +20,7 @@ echo "The passphrase is test"
|
|
||||||
set -e
|
|
||||||
cryptsetup luksOpen /dev/md0 dracut_crypt_test </keyfile
|
|
||||||
lvm pvcreate -ff -y /dev/mapper/dracut_crypt_test
|
|
||||||
-lvm vgcreate dracut /dev/mapper/dracut_crypt_test
|
|
||||||
+lvm vgcreate dracut /dev/mapper/dracut_crypt_test
|
|
||||||
lvm lvcreate -l 100%FREE -n root dracut
|
|
||||||
lvm vgchange -ay
|
|
||||||
mke2fs -L root /dev/dracut/root
|
|
||||||
@@ -29,12 +29,14 @@ mount /dev/dracut/root /sysroot
|
|
||||||
cp -a -t /sysroot /source/*
|
|
||||||
mkdir /sysroot/run
|
|
||||||
umount /sysroot
|
|
||||||
-lvm lvchange -a n /dev/dracut/root
|
|
||||||
+lvm lvchange -a n /dev/dracut/root
|
|
||||||
udevadm settle
|
|
||||||
cryptsetup luksClose /dev/mapper/dracut_crypt_test
|
|
||||||
udevadm settle
|
|
||||||
mdadm -W /dev/md0 || :
|
|
||||||
+udevadm settle
|
|
||||||
mdadm --detail --export /dev/md0 |grep -F MD_UUID > /tmp/mduuid
|
|
||||||
. /tmp/mduuid
|
|
||||||
+udevadm settle
|
|
||||||
eval $(udevadm info --query=env --name=/dev/md0|while read line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done;)
|
|
||||||
{ echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID; echo "ID_FS_UUID=$ID_FS_UUID";} | dd oflag=direct,dsync of=/dev/sda
|
|
||||||
|
|
46
0018.patch
46
0018.patch
@ -1,46 +0,0 @@
|
|||||||
From 3dcaa97ca4dcfa8092252a22df62c60941e59ce3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
||||||
Date: Wed, 11 Mar 2020 09:40:50 +0100
|
|
||||||
Subject: [PATCH] network-manager: ensure that nm-run.sh is executed when
|
|
||||||
needed
|
|
||||||
|
|
||||||
The network-manager command line hook must install a
|
|
||||||
initqueue/finished hook to ensure that nm-run.sh is executed when
|
|
||||||
there are network connections to activate.
|
|
||||||
|
|
||||||
Fixes: #694
|
|
||||||
---
|
|
||||||
modules.d/35network-manager/nm-config.sh | 11 +++++++++++
|
|
||||||
modules.d/35network-manager/nm-run.sh | 2 ++
|
|
||||||
2 files changed, 13 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/modules.d/35network-manager/nm-config.sh b/modules.d/35network-manager/nm-config.sh
|
|
||||||
index 1efa737c..39a1c8bd 100755
|
|
||||||
--- a/modules.d/35network-manager/nm-config.sh
|
|
||||||
+++ b/modules.d/35network-manager/nm-config.sh
|
|
||||||
@@ -5,3 +5,14 @@ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
/usr/libexec/nm-initrd-generator -- $(getcmdline)
|
|
||||||
+
|
|
||||||
+if getargbool 0 rd.neednet; then
|
|
||||||
+ for i in /usr/lib/NetworkManager/system-connections/* \
|
|
||||||
+ /run/NetworkManager/system-connections/* \
|
|
||||||
+ /etc/NetworkManager/system-connections/* \
|
|
||||||
+ /etc/sysconfig/network-scripts/ifcfg-*; do
|
|
||||||
+ [ -f "$i" ] || continue
|
|
||||||
+ echo '[ -f /tmp/nm.done ]' >$hookdir/initqueue/finished/nm.sh
|
|
||||||
+ break
|
|
||||||
+ done
|
|
||||||
+fi
|
|
||||||
diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
|
|
||||||
index 4079b735..fc5280a1 100755
|
|
||||||
--- a/modules.d/35network-manager/nm-run.sh
|
|
||||||
+++ b/modules.d/35network-manager/nm-run.sh
|
|
||||||
@@ -22,3 +22,5 @@ do
|
|
||||||
source_hook initqueue/online $ifname
|
|
||||||
/sbin/netroot $ifname
|
|
||||||
done
|
|
||||||
+
|
|
||||||
+> /tmp/nm.done
|
|
||||||
|
|
344
0019.patch
344
0019.patch
@ -1,344 +0,0 @@
|
|||||||
From a22ab24d5371cbd73b18b27e98e980e45e39ff5f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Thu, 12 Mar 2020 11:55:37 +0100
|
|
||||||
Subject: [PATCH] test: use dd from /dev/zero, instead of creating files with a
|
|
||||||
hole
|
|
||||||
|
|
||||||
---
|
|
||||||
test/TEST-01-BASIC/test.sh | 2 +-
|
|
||||||
test/TEST-02-SYSTEMD/test.sh | 2 +-
|
|
||||||
test/TEST-03-USR-MOUNT/test.sh | 4 ++--
|
|
||||||
test/TEST-04-FULL-SYSTEMD/test.sh | 4 ++--
|
|
||||||
test/TEST-10-RAID/test.sh | 2 +-
|
|
||||||
test/TEST-11-LVM/test.sh | 2 +-
|
|
||||||
test/TEST-12-RAID-DEG/test.sh | 10 +++++-----
|
|
||||||
test/TEST-13-ENC-RAID-LVM/test.sh | 2 +-
|
|
||||||
test/TEST-14-IMSM/test.sh | 8 ++++----
|
|
||||||
test/TEST-15-BTRFSRAID/test.sh | 2 +-
|
|
||||||
test/TEST-17-LVM-THIN/test.sh | 2 +-
|
|
||||||
test/TEST-20-NFS/test.sh | 2 +-
|
|
||||||
test/TEST-30-ISCSI/test.sh | 10 +++++-----
|
|
||||||
test/TEST-35-ISCSI-MULTI/test.sh | 10 +++++-----
|
|
||||||
test/TEST-40-NBD/test.sh | 8 ++++----
|
|
||||||
test/TEST-50-MULTINIC/test.sh | 2 +-
|
|
||||||
test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh | 2 +-
|
|
||||||
17 files changed, 37 insertions(+), 37 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
|
|
||||||
index c47098ea..668a35d8 100755
|
|
||||||
--- a/test/TEST-01-BASIC/test.sh
|
|
||||||
+++ b/test/TEST-01-BASIC/test.sh
|
|
||||||
@@ -20,7 +20,7 @@ test_run() {
|
|
||||||
test_setup() {
|
|
||||||
rm -f -- $TESTDIR/root.ext3
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=80
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.ext3 bs=1M count=80
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
|
|
||||||
index cf1fcaa5..5c0a54de 100755
|
|
||||||
--- a/test/TEST-02-SYSTEMD/test.sh
|
|
||||||
+++ b/test/TEST-02-SYSTEMD/test.sh
|
|
||||||
@@ -16,7 +16,7 @@ test_run() {
|
|
||||||
test_setup() {
|
|
||||||
rm -f -- $TESTDIR/root.ext3
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=80
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.ext3 bs=1M count=80
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
|
|
||||||
index 5de7f4a1..5190f220 100755
|
|
||||||
--- a/test/TEST-03-USR-MOUNT/test.sh
|
|
||||||
+++ b/test/TEST-03-USR-MOUNT/test.sh
|
|
||||||
@@ -41,8 +41,8 @@ test_setup() {
|
|
||||||
rm -f -- $TESTDIR/root.btrfs
|
|
||||||
rm -f -- $TESTDIR/usr.btrfs
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.btrfs bs=1M seek=160
|
|
||||||
- dd if=/dev/null of=$TESTDIR/usr.btrfs bs=1M seek=160
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.btrfs bs=1M count=160
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/usr.btrfs bs=1M count=160
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
||||||
index 3a544d7c..e3b23327 100755
|
|
||||||
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
||||||
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
||||||
@@ -42,8 +42,8 @@ test_setup() {
|
|
||||||
rm -f -- $TESTDIR/root.btrfs
|
|
||||||
rm -f -- $TESTDIR/usr.btrfs
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.btrfs bs=1M seek=320
|
|
||||||
- dd if=/dev/null of=$TESTDIR/usr.btrfs bs=1M seek=320
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.btrfs bs=1M count=320
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/usr.btrfs bs=1M count=320
|
|
||||||
|
|
||||||
export kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
|
|
||||||
index 981c1b9d..4203cfdc 100755
|
|
||||||
--- a/test/TEST-10-RAID/test.sh
|
|
||||||
+++ b/test/TEST-10-RAID/test.sh
|
|
||||||
@@ -19,7 +19,7 @@ test_setup() {
|
|
||||||
DISKIMAGE=$TESTDIR/TEST-10-RAID-root.img
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
rm -f -- $DISKIMAGE
|
|
||||||
- dd if=/dev/null of=$DISKIMAGE bs=1M seek=128
|
|
||||||
+ dd if=/dev/zero of=$DISKIMAGE bs=1M count=128
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
|
|
||||||
index c718ad57..22643758 100755
|
|
||||||
--- a/test/TEST-11-LVM/test.sh
|
|
||||||
+++ b/test/TEST-11-LVM/test.sh
|
|
||||||
@@ -16,7 +16,7 @@ test_run() {
|
|
||||||
|
|
||||||
test_setup() {
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=80
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.ext2 bs=1M count=80
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
|
|
||||||
index f8dc08d9..09eb28bb 100755
|
|
||||||
--- a/test/TEST-12-RAID-DEG/test.sh
|
|
||||||
+++ b/test/TEST-12-RAID-DEG/test.sh
|
|
||||||
@@ -25,7 +25,7 @@ client_run() {
|
|
||||||
return 1;
|
|
||||||
fi
|
|
||||||
rm -f -- $TESTDIR/marker.img
|
|
||||||
- dd if=/dev/null of=$TESTDIR/marker.img bs=1M seek=40
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/marker.img bs=1M count=40
|
|
||||||
|
|
||||||
echo "CLIENT TEST END: $@ [OK]"
|
|
||||||
return 0
|
|
||||||
@@ -56,10 +56,10 @@ test_run() {
|
|
||||||
test_setup() {
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
rm -f -- $TESTDIR/marker.img
|
|
||||||
- dd if=/dev/null of=$TESTDIR/marker.img bs=1M seek=40
|
|
||||||
- dd if=/dev/null of=$TESTDIR/disk1.img bs=1M seek=35
|
|
||||||
- dd if=/dev/null of=$TESTDIR/disk2.img bs=1M seek=35
|
|
||||||
- dd if=/dev/null of=$TESTDIR/disk3.img bs=1M seek=35
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/marker.img bs=1M count=40
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/disk1.img bs=1M count=35
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/disk2.img bs=1M count=35
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/disk3.img bs=1M count=35
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
||||||
index 580ade85..16ee8e66 100755
|
|
||||||
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
||||||
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
||||||
@@ -50,7 +50,7 @@ test_run() {
|
|
||||||
test_setup() {
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
rm -f -- $TESTDIR/root.ext2
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=134
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.ext2 bs=1M count=134
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
|
|
||||||
index 2f153ba3..1f822e4e 100755
|
|
||||||
--- a/test/TEST-14-IMSM/test.sh
|
|
||||||
+++ b/test/TEST-14-IMSM/test.sh
|
|
||||||
@@ -11,7 +11,7 @@ client_run() {
|
|
||||||
echo "CLIENT TEST START: $@"
|
|
||||||
|
|
||||||
rm -f -- $TESTDIR/marker.img
|
|
||||||
- dd if=/dev/null of=$TESTDIR/marker.img bs=1M seek=1
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/marker.img bs=1M count=1
|
|
||||||
|
|
||||||
$testdir/run-qemu \
|
|
||||||
-drive format=raw,index=0,media=disk,file=$TESTDIR/marker.img \
|
|
||||||
@@ -53,9 +53,9 @@ test_setup() {
|
|
||||||
rm -f -- $TESTDIR/marker.img
|
|
||||||
rm -f -- $TESTDIR/disk1
|
|
||||||
rm -f -- $TESTDIR/disk2
|
|
||||||
- dd if=/dev/null of=$TESTDIR/marker.img bs=1M seek=1
|
|
||||||
- dd if=/dev/null of=$TESTDIR/disk1 bs=1M seek=104
|
|
||||||
- dd if=/dev/null of=$TESTDIR/disk2 bs=1M seek=104
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/marker.img bs=1M count=1
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/disk1 bs=1M count=104
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/disk2 bs=1M count=104
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
|
|
||||||
index 435e52be..227daaba 100755
|
|
||||||
--- a/test/TEST-15-BTRFSRAID/test.sh
|
|
||||||
+++ b/test/TEST-15-BTRFSRAID/test.sh
|
|
||||||
@@ -21,7 +21,7 @@ test_setup() {
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img
|
|
||||||
rm -f -- $DISKIMAGE
|
|
||||||
- dd if=/dev/null of=$DISKIMAGE bs=1M seek=1024
|
|
||||||
+ dd if=/dev/zero of=$DISKIMAGE bs=1M count=1024
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
|
|
||||||
index e4755f78..8ab30a45 100755
|
|
||||||
--- a/test/TEST-17-LVM-THIN/test.sh
|
|
||||||
+++ b/test/TEST-17-LVM-THIN/test.sh
|
|
||||||
@@ -16,7 +16,7 @@ test_run() {
|
|
||||||
|
|
||||||
test_setup() {
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=92
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.ext2 bs=1M count=92
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
|
|
||||||
index 9d5493c7..53d1d804 100755
|
|
||||||
--- a/test/TEST-20-NFS/test.sh
|
|
||||||
+++ b/test/TEST-20-NFS/test.sh
|
|
||||||
@@ -225,7 +225,7 @@ test_run() {
|
|
||||||
|
|
||||||
test_setup() {
|
|
||||||
# Make server root
|
|
||||||
- dd if=/dev/null of=$TESTDIR/server.ext3 bs=1M seek=120
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/server.ext3 bs=1M count=120
|
|
||||||
mke2fs -j -F $TESTDIR/server.ext3
|
|
||||||
mkdir $TESTDIR/mnt
|
|
||||||
mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt
|
|
||||||
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
|
|
||||||
index a8aee221..2f37f5c9 100755
|
|
||||||
--- a/test/TEST-30-ISCSI/test.sh
|
|
||||||
+++ b/test/TEST-30-ISCSI/test.sh
|
|
||||||
@@ -129,9 +129,9 @@ test_setup() {
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=45
|
|
||||||
- dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=45
|
|
||||||
- dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=45
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.ext3 bs=1M count=45
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/iscsidisk2.img bs=1M count=45
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/iscsidisk3.img bs=1M count=45
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
@@ -182,7 +182,7 @@ test_setup() {
|
|
||||||
|
|
||||||
|
|
||||||
# Need this so kvm-qemu will boot (needs non-/dev/zero local disk)
|
|
||||||
- if ! dd if=/dev/null of=$TESTDIR/client.img bs=1M seek=1; then
|
|
||||||
+ if ! dd if=/dev/zero of=$TESTDIR/client.img bs=1M count=1; then
|
|
||||||
echo "Unable to make client sdb image" 1>&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
@@ -198,7 +198,7 @@ test_setup() {
|
|
||||||
rm -- $TESTDIR/client.img
|
|
||||||
|
|
||||||
# Make server root
|
|
||||||
- dd if=/dev/null of=$TESTDIR/server.ext3 bs=1M seek=60
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/server.ext3 bs=1M count=60
|
|
||||||
mkfs.ext3 -j -F $TESTDIR/server.ext3
|
|
||||||
mkdir $TESTDIR/mnt
|
|
||||||
mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt
|
|
||||||
diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh
|
|
||||||
index 740ab918..54700609 100755
|
|
||||||
--- a/test/TEST-35-ISCSI-MULTI/test.sh
|
|
||||||
+++ b/test/TEST-35-ISCSI-MULTI/test.sh
|
|
||||||
@@ -144,9 +144,9 @@ test_setup() {
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=90
|
|
||||||
- dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=90
|
|
||||||
- dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=90
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/root.ext3 bs=1M count=90
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/iscsidisk2.img bs=1M count=90
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/iscsidisk3.img bs=1M count=90
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
@@ -197,7 +197,7 @@ test_setup() {
|
|
||||||
|
|
||||||
|
|
||||||
# Need this so kvm-qemu will boot (needs non-/dev/zero local disk)
|
|
||||||
- if ! dd if=/dev/null of=$TESTDIR/client.img bs=1M seek=1; then
|
|
||||||
+ if ! dd if=/dev/zero of=$TESTDIR/client.img bs=1M count=1; then
|
|
||||||
echo "Unable to make client sdb image" 1>&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
@@ -213,7 +213,7 @@ test_setup() {
|
|
||||||
rm -- $TESTDIR/client.img
|
|
||||||
|
|
||||||
# Make server root
|
|
||||||
- dd if=/dev/null of=$TESTDIR/server.ext3 bs=1M seek=60
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/server.ext3 bs=1M count=60
|
|
||||||
mkfs.ext3 -j -F $TESTDIR/server.ext3
|
|
||||||
mkdir $TESTDIR/mnt
|
|
||||||
mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt
|
|
||||||
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
|
|
||||||
index f06c36c3..b6c45f01 100755
|
|
||||||
--- a/test/TEST-40-NBD/test.sh
|
|
||||||
+++ b/test/TEST-40-NBD/test.sh
|
|
||||||
@@ -209,8 +209,8 @@ client_run() {
|
|
||||||
|
|
||||||
make_encrypted_root() {
|
|
||||||
# Create the blank file to use as a root filesystem
|
|
||||||
- dd if=/dev/null of=$TESTDIR/encrypted.ext2 bs=1M seek=80
|
|
||||||
- dd if=/dev/null of=$TESTDIR/flag.img bs=1M seek=1
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/encrypted.ext2 bs=1M count=80
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/flag.img bs=1M count=1
|
|
||||||
|
|
||||||
kernel=$KVERSION
|
|
||||||
# Create what will eventually be our root filesystem onto an overlay
|
|
||||||
@@ -280,7 +280,7 @@ make_encrypted_root() {
|
|
||||||
}
|
|
||||||
|
|
||||||
make_client_root() {
|
|
||||||
- dd if=/dev/null of=$TESTDIR/nbd.ext2 bs=1M seek=120
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/nbd.ext2 bs=1M count=120
|
|
||||||
mke2fs -F -j $TESTDIR/nbd.ext2
|
|
||||||
mkdir $TESTDIR/mnt
|
|
||||||
if ! mount -o loop $TESTDIR/nbd.ext2 $TESTDIR/mnt; then
|
|
||||||
@@ -325,7 +325,7 @@ make_client_root() {
|
|
||||||
}
|
|
||||||
|
|
||||||
make_server_root() {
|
|
||||||
- dd if=/dev/null of=$TESTDIR/server.ext2 bs=1M seek=120
|
|
||||||
+ dd if=/dev/zero of=$TESTDIR/server.ext2 bs=1M count=120
|
|
||||||
mke2fs -F $TESTDIR/server.ext2
|
|
||||||
mkdir $TESTDIR/mnt
|
|
||||||
mount -o loop $TESTDIR/server.ext2 $TESTDIR/mnt
|
|
||||||
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
|
|
||||||
index b4326d5a..be87caab 100755
|
|
||||||
--- a/test/TEST-50-MULTINIC/test.sh
|
|
||||||
+++ b/test/TEST-50-MULTINIC/test.sh
|
|
||||||
@@ -173,7 +173,7 @@ test_client() {
|
|
||||||
|
|
||||||
test_setup() {
|
|
||||||
# Make server root
|
|
||||||
- dd if=/dev/null of="$TESTDIR"/server.ext3 bs=1M seek=120
|
|
||||||
+ dd if=/dev/zero of="$TESTDIR"/server.ext3 bs=1M count=120
|
|
||||||
mke2fs -j -F -- "$TESTDIR"/server.ext3
|
|
||||||
mkdir -- "$TESTDIR"/mnt
|
|
||||||
mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
|
|
||||||
diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
|
|
||||||
index 72826a5d..accfa006 100755
|
|
||||||
--- a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
|
|
||||||
+++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
|
|
||||||
@@ -199,7 +199,7 @@ root=nfs:192.168.50.1:/nfs/client bootdev=br0
|
|
||||||
|
|
||||||
test_setup() {
|
|
||||||
# Make server root
|
|
||||||
- dd if=/dev/null of="$TESTDIR"/server.ext3 bs=1M seek=120
|
|
||||||
+ dd if=/dev/zero of="$TESTDIR"/server.ext3 bs=1M count=120
|
|
||||||
mke2fs -j -F -- "$TESTDIR"/server.ext3
|
|
||||||
mkdir -- "$TESTDIR"/mnt
|
|
||||||
mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
|
|
||||||
|
|
53
0020.patch
53
0020.patch
@ -1,53 +0,0 @@
|
|||||||
From d5bfaf58ab2098737bad92008916d39a0ec361db Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Thu, 12 Mar 2020 12:50:08 +0100
|
|
||||||
Subject: [PATCH] github actions: use test container directly
|
|
||||||
|
|
||||||
---
|
|
||||||
.github/workflows/fedora-30.yml | 6 ++++--
|
|
||||||
.github/workflows/fedora-31.yml | 6 ++++--
|
|
||||||
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/fedora-30.yml b/.github/workflows/fedora-30.yml
|
|
||||||
index 345ed0d4..1a3d3e8d 100644
|
|
||||||
--- a/.github/workflows/fedora-30.yml
|
|
||||||
+++ b/.github/workflows/fedora-30.yml
|
|
||||||
@@ -13,7 +13,9 @@ on:
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
- #container: quay.io/haraldh/dracut-fedora:30
|
|
||||||
+ container:
|
|
||||||
+ image: quay.io/haraldh/dracut-fedora:30
|
|
||||||
+ options: "--privileged"
|
|
||||||
timeout-minutes: 45
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
@@ -45,4 +47,4 @@ jobs:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: "TEST-${{ matrix.test }}"
|
|
||||||
- run: docker run --privileged -v $(pwd)/:/dracut quay.io/haraldh/dracut-fedora:30 /dracut/fedora-test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
|
|
||||||
+ run: ./fedora-test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
|
|
||||||
diff --git a/.github/workflows/fedora-31.yml b/.github/workflows/fedora-31.yml
|
|
||||||
index 20ad62c2..aa829df2 100644
|
|
||||||
--- a/.github/workflows/fedora-31.yml
|
|
||||||
+++ b/.github/workflows/fedora-31.yml
|
|
||||||
@@ -13,7 +13,9 @@ on:
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
- #container: quay.io/haraldh/dracut-fedora:30
|
|
||||||
+ container:
|
|
||||||
+ image: quay.io/haraldh/dracut-fedora:31
|
|
||||||
+ options: "--privileged"
|
|
||||||
timeout-minutes: 45
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
@@ -51,4 +53,4 @@ jobs:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: "TEST-${{ matrix.test }}"
|
|
||||||
- run: docker run --privileged -v $(pwd)/:/dracut quay.io/haraldh/dracut-fedora:31 /dracut/fedora-test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
|
|
||||||
+ run: ./fedora-test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
|
|
||||||
|
|
23
0021.patch
23
0021.patch
@ -1,23 +0,0 @@
|
|||||||
From 3b396a7d5092cec4c7b185bda63906069b8ec320 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Thu, 12 Mar 2020 13:22:10 +0100
|
|
||||||
Subject: [PATCH] TEST-41-NBD-NM/Makefile: should be based on TEST-40-NBD not
|
|
||||||
TEST-20-NFS
|
|
||||||
|
|
||||||
---
|
|
||||||
test/TEST-41-NBD-NM/Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/test/TEST-41-NBD-NM/Makefile b/test/TEST-41-NBD-NM/Makefile
|
|
||||||
index b19122a1..47c90c31 100644
|
|
||||||
--- a/test/TEST-41-NBD-NM/Makefile
|
|
||||||
+++ b/test/TEST-41-NBD-NM/Makefile
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
.PHONY: all setup clean run
|
|
||||||
|
|
||||||
-BASETEST=../TEST-20-NFS
|
|
||||||
+BASETEST=../TEST-40-NBD
|
|
||||||
|
|
||||||
all:
|
|
||||||
@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) all
|
|
||||||
|
|
30
0022.patch
30
0022.patch
@ -1,30 +0,0 @@
|
|||||||
From 7069132ec7e94a3274aa1b3b3b6e339066118a4d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
||||||
Date: Tue, 10 Mar 2020 15:18:37 +0100
|
|
||||||
Subject: [PATCH] network: fix glob matching ipv6 addresses
|
|
||||||
|
|
||||||
In this case we want to cover three cases
|
|
||||||
1) ip_address:ip_address
|
|
||||||
2) number:macaddress
|
|
||||||
3) :macaddress
|
|
||||||
|
|
||||||
We consider something an IPv6 address if it starts with number and
|
|
||||||
contains ":", but IPv6 addresses are in hexa.
|
|
||||||
---
|
|
||||||
modules.d/40network/net-lib.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
|
|
||||||
index 16730e5b..7f185fdd 100755
|
|
||||||
--- a/modules.d/40network/net-lib.sh
|
|
||||||
+++ b/modules.d/40network/net-lib.sh
|
|
||||||
@@ -510,7 +510,7 @@ ip_to_var() {
|
|
||||||
[ -n "$6" ] && dev=$6
|
|
||||||
[ -n "$7" ] && autoconf=$7
|
|
||||||
case "$8" in
|
|
||||||
- [0-9]*:*|[0-9]*.[0-9]*.[0-9]*.[0-9]*)
|
|
||||||
+ [0-9a-fA-F]*:*|[0-9]*.[0-9]*.[0-9]*.[0-9]*)
|
|
||||||
dns1="$8"
|
|
||||||
[ -n "$9" ] && dns2="$9"
|
|
||||||
;;
|
|
||||||
|
|
90
0023.patch
90
0023.patch
@ -1,90 +0,0 @@
|
|||||||
From ca8ca19091a1822ee813657764263f76ffaa4ebb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Thu, 12 Mar 2020 13:01:46 +0100
|
|
||||||
Subject: [PATCH] .travis.yml: reformat
|
|
||||||
|
|
||||||
---
|
|
||||||
.travis.yml | 56 ++++++++++++++++++++++++++++----------------------------
|
|
||||||
1 file changed, 28 insertions(+), 28 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/.travis.yml b/.travis.yml
|
|
||||||
index e9f62a98..a82e1778 100644
|
|
||||||
--- a/.travis.yml
|
|
||||||
+++ b/.travis.yml
|
|
||||||
@@ -2,34 +2,34 @@ language: generic
|
|
||||||
dist: bionic
|
|
||||||
sudo: required
|
|
||||||
services:
|
|
||||||
-- docker
|
|
||||||
+ - docker
|
|
||||||
env:
|
|
||||||
matrix:
|
|
||||||
- - IMAGE=latest
|
|
||||||
- - IMAGE=latest TESTS=01
|
|
||||||
- - IMAGE=latest TESTS=12
|
|
||||||
- - IMAGE=latest TESTS=20
|
|
||||||
- - IMAGE=latest TESTS=21
|
|
||||||
- - IMAGE=latest TESTS=50
|
|
||||||
- - IMAGE=latest TESTS=51
|
|
||||||
- - IMAGE=latest TESTS=30
|
|
||||||
- - IMAGE=latest TESTS=31
|
|
||||||
- - IMAGE=latest TESTS=35
|
|
||||||
- - IMAGE=latest TESTS=36
|
|
||||||
- - IMAGE=latest TESTS=40
|
|
||||||
- - IMAGE=latest TESTS=41
|
|
||||||
- - IMAGE=latest TESTS=60
|
|
||||||
- - IMAGE=latest TESTS=61
|
|
||||||
- - IMAGE=latest TESTS=99
|
|
||||||
- - IMAGE=latest TESTS=02
|
|
||||||
- - IMAGE=latest TESTS=03
|
|
||||||
- - IMAGE=latest TESTS=04
|
|
||||||
- - IMAGE=latest TESTS=10
|
|
||||||
- - IMAGE=latest TESTS=11
|
|
||||||
- - IMAGE=latest TESTS=13
|
|
||||||
- - IMAGE=latest TESTS=14
|
|
||||||
- - IMAGE=latest TESTS=15
|
|
||||||
- - IMAGE=latest TESTS=17
|
|
||||||
+ - IMAGE=latest
|
|
||||||
+ - IMAGE=latest TESTS=01
|
|
||||||
+ - IMAGE=latest TESTS=12
|
|
||||||
+ - IMAGE=latest TESTS=20
|
|
||||||
+ - IMAGE=latest TESTS=21
|
|
||||||
+ - IMAGE=latest TESTS=50
|
|
||||||
+ - IMAGE=latest TESTS=51
|
|
||||||
+ - IMAGE=latest TESTS=30
|
|
||||||
+ - IMAGE=latest TESTS=31
|
|
||||||
+ - IMAGE=latest TESTS=35
|
|
||||||
+ - IMAGE=latest TESTS=36
|
|
||||||
+ - IMAGE=latest TESTS=40
|
|
||||||
+ - IMAGE=latest TESTS=41
|
|
||||||
+ - IMAGE=latest TESTS=60
|
|
||||||
+ - IMAGE=latest TESTS=61
|
|
||||||
+ - IMAGE=latest TESTS=99
|
|
||||||
+ - IMAGE=latest TESTS=02
|
|
||||||
+ - IMAGE=latest TESTS=03
|
|
||||||
+ - IMAGE=latest TESTS=04
|
|
||||||
+ - IMAGE=latest TESTS=10
|
|
||||||
+ - IMAGE=latest TESTS=11
|
|
||||||
+ - IMAGE=latest TESTS=13
|
|
||||||
+ - IMAGE=latest TESTS=14
|
|
||||||
+ - IMAGE=latest TESTS=15
|
|
||||||
+ - IMAGE=latest TESTS=17
|
|
||||||
|
|
||||||
before_script:
|
|
||||||
- docker pull quay.io/haraldh/dracut-fedora:$IMAGE
|
|
||||||
@@ -44,12 +44,12 @@ before_script:
|
|
||||||
|
|
||||||
script:
|
|
||||||
## The test container is created with https://github.com/dracutdevs/fedora-container
|
|
||||||
-- docker run --privileged -it -v $(pwd)/:/dracut quay.io/haraldh/dracut-fedora:$IMAGE /dracut/fedora-test.sh $IMAGE-$$ "$TESTS"
|
|
||||||
+ - docker run --privileged -it -v $(pwd)/:/dracut quay.io/haraldh/dracut-fedora:$IMAGE /dracut/fedora-test.sh $IMAGE-$$ "$TESTS"
|
|
||||||
|
|
||||||
notifications:
|
|
||||||
webhooks:
|
|
||||||
urls:
|
|
||||||
- - https://webhooks.gitter.im/e/effa917ca3e0ed5fd00e
|
|
||||||
+ - https://webhooks.gitter.im/e/effa917ca3e0ed5fd00e
|
|
||||||
on_success: change # options: [always|never|change] default: always
|
|
||||||
on_failure: always # options: [always|never|change] default: always
|
|
||||||
on_start: never # options: [always|never|change] default: always
|
|
||||||
|
|
24
0024.patch
24
0024.patch
@ -1,24 +0,0 @@
|
|||||||
From 91418b13dc679947bb4d22ae6badcbf41b56c645 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Thu, 12 Mar 2020 13:44:08 +0100
|
|
||||||
Subject: [PATCH] TEST-03-USR-MOUNT/test.sh: increase loglevel
|
|
||||||
|
|
||||||
to debug the spurious fails
|
|
||||||
---
|
|
||||||
test/TEST-03-USR-MOUNT/test.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
|
|
||||||
index 5190f220..3bb479e4 100755
|
|
||||||
--- a/test/TEST-03-USR-MOUNT/test.sh
|
|
||||||
+++ b/test/TEST-03-USR-MOUNT/test.sh
|
|
||||||
@@ -19,7 +19,7 @@ client_run() {
|
|
||||||
-drive format=raw,index=1,media=disk,file=$TESTDIR/usr.btrfs \
|
|
||||||
-drive format=raw,index=2,media=disk,file=$TESTDIR/result \
|
|
||||||
-watchdog i6300esb -watchdog-action poweroff \
|
|
||||||
- -append "panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
|
|
||||||
+ -append "panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts loglevel=7 rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
|
|
||||||
-initrd $TESTDIR/initramfs.testing
|
|
||||||
|
|
||||||
if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/result; then
|
|
||||||
|
|
27
0025.patch
27
0025.patch
@ -1,27 +0,0 @@
|
|||||||
From 97a931c7d9f8190115893a932f2e10292704cae4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dusty Mabe <dusty@dustymabe.com>
|
|
||||||
Date: Fri, 13 Mar 2020 15:40:11 -0400
|
|
||||||
Subject: [PATCH] don't prefer $TMPDIR over --tmpdir
|
|
||||||
|
|
||||||
Ability to use `$TMPDIR` was introduced in bc1e69b but
|
|
||||||
causes the `--tmpdir` option on the command line to be
|
|
||||||
ignored. Switch to only using `$TMPDIR` if `--tmpdir`
|
|
||||||
wasn't specified.
|
|
||||||
---
|
|
||||||
dracut.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.sh b/dracut.sh
|
|
||||||
index ab82cbc9..39fa3692 100755
|
|
||||||
--- a/dracut.sh
|
|
||||||
+++ b/dracut.sh
|
|
||||||
@@ -765,7 +765,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
|
|
||||||
[[ $dracutbasedir ]] || dracutbasedir=$dracutsysrootdir/usr/lib/dracut
|
|
||||||
[[ $fw_dir ]] || fw_dir="$dracutsysrootdir/lib/firmware/updates:$dracutsysrootdir/lib/firmware:$dracutsysrootdir/lib/firmware/$kernel"
|
|
||||||
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
|
|
||||||
-[[ $tmpdir ]] && tmpdir="$TMPDIR"
|
|
||||||
+[[ $tmpdir ]] || tmpdir="$TMPDIR"
|
|
||||||
[[ $tmpdir ]] || tmpdir=$dracutsysrootdir/var/tmp
|
|
||||||
[[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
|
|
||||||
[[ $compress_l ]] && compress=$compress_l
|
|
||||||
|
|
32
0026.patch
32
0026.patch
@ -1,32 +0,0 @@
|
|||||||
From 17d62d12065c264d899609cf69e8d913fc84460d Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
|
|
||||||
<congdanhqx@gmail.com>
|
|
||||||
Date: Sat, 14 Mar 2020 11:44:47 +0700
|
|
||||||
Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
|
|
||||||
|
|
||||||
In either case:
|
|
||||||
- encrypted device is decrypted, udev will trigger device changes again,
|
|
||||||
- multiple encrypted device,
|
|
||||||
|
|
||||||
cryptroot-ask will run multiple time, then report:
|
|
||||||
> mkdir: cannot create directory '/run/cryptsetup': File exists
|
|
||||||
|
|
||||||
Pass `-p` into mkdir to ignore that warning.
|
|
||||||
---
|
|
||||||
modules.d/90crypt/cryptroot-ask.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
|
|
||||||
index e1f17975..97047ae9 100755
|
|
||||||
--- a/modules.d/90crypt/cryptroot-ask.sh
|
|
||||||
+++ b/modules.d/90crypt/cryptroot-ask.sh
|
|
||||||
@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
|
|
||||||
|
|
||||||
. /lib/dracut-lib.sh
|
|
||||||
|
|
||||||
-mkdir -m 0700 /run/cryptsetup
|
|
||||||
+mkdir -p -m 0700 /run/cryptsetup
|
|
||||||
|
|
||||||
# if device name is /dev/dm-X, convert to /dev/mapper/name
|
|
||||||
if [ "${1##/dev/dm-}" != "$1" ]; then
|
|
||||||
|
|
50
0027.patch
50
0027.patch
@ -1,50 +0,0 @@
|
|||||||
From dfe2247a43d6a216d9af533825c9a103e3b056cd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Wed, 23 Oct 2019 14:16:56 +0200
|
|
||||||
Subject: [PATCH] dracut.sh: add check for invalid configuration files
|
|
||||||
|
|
||||||
Emit a warning about possible misconfigured configuration files, where
|
|
||||||
the spaces around values are missing for +=""
|
|
||||||
|
|
||||||
Better report a possible source of problems. We can fix annoying false
|
|
||||||
positives later.
|
|
||||||
---
|
|
||||||
dracut.sh | 14 +++++++++++++-
|
|
||||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.sh b/dracut.sh
|
|
||||||
index 39fa3692..81c6d654 100755
|
|
||||||
--- a/dracut.sh
|
|
||||||
+++ b/dracut.sh
|
|
||||||
@@ -279,6 +279,14 @@ read_arg() {
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
+check_conf_file()
|
|
||||||
+{
|
|
||||||
+ if grep -H -e '^[^#]*[+]=\("[^ ]\|.*[^ ]"\)' "$@"; then
|
|
||||||
+ printf '\ndracut: WARNING: <key>+=" <values> ": <values> should have surrounding white spaces!\n' >&2
|
|
||||||
+ printf 'dracut: WARNING: This will lead to unwanted side effects! Please fix the configuration file.\n\n' >&2
|
|
||||||
+ fi
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
dropindirs_sort()
|
|
||||||
{
|
|
||||||
local suffix=$1; shift
|
|
||||||
@@ -703,10 +711,14 @@ if [[ ! -d $confdir ]]; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
# source our config file
|
|
||||||
-[[ -f $conffile ]] && . "$conffile"
|
|
||||||
+if [[ -f $conffile ]]; then
|
|
||||||
+ check_conf_file "$conffile"
|
|
||||||
+ . "$conffile"
|
|
||||||
+fi
|
|
||||||
|
|
||||||
# source our config dir
|
|
||||||
for f in $(dropindirs_sort ".conf" "$confdir" "$dracutbasedir/dracut.conf.d"); do
|
|
||||||
+ check_conf_file "$f"
|
|
||||||
[[ -e $f ]] && . "$f"
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
25
0028.patch
25
0028.patch
@ -1,25 +0,0 @@
|
|||||||
From c490ea8b2be52910c8ce70d08717cf1996c0d732 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
||||||
Date: Sat, 21 Apr 2018 00:11:17 +0200
|
|
||||||
Subject: [PATCH] Make externally defined CFLAGS work
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 02e2c4b5..0cc8b390 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -18,8 +18,8 @@ pkglibdir ?= ${libdir}/dracut
|
|
||||||
sysconfdir ?= ${prefix}/etc
|
|
||||||
bindir ?= ${prefix}/bin
|
|
||||||
mandir ?= ${prefix}/share/man
|
|
||||||
-CFLAGS ?= -O2 -g -Wall
|
|
||||||
-CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 $(KMOD_CFLAGS)
|
|
||||||
+CFLAGS ?= -O2 -g -Wall -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2
|
|
||||||
+CFLAGS += $(KMOD_CFLAGS)
|
|
||||||
bashcompletiondir ?= ${datadir}/bash-completion/completions
|
|
||||||
pkgconfigdatadir ?= $(datadir)/pkgconfig
|
|
||||||
|
|
||||||
|
|
35
0029.patch
35
0029.patch
@ -1,35 +0,0 @@
|
|||||||
From db44331dc4513886e83e387604887033868c5214 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
||||||
Date: Fri, 13 Mar 2020 11:39:46 +0100
|
|
||||||
Subject: [PATCH] Makefile: really make externally defined CFLAGS work
|
|
||||||
|
|
||||||
The fix in aed52a6cfb43ebea372328fd5837c1f341c3f0df does not
|
|
||||||
work (second line will be ignored on override), so expand the implicitly
|
|
||||||
defined rule and add them there.
|
|
||||||
---
|
|
||||||
Makefile | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 0cc8b390..7eb31847 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -19,7 +19,6 @@ sysconfdir ?= ${prefix}/etc
|
|
||||||
bindir ?= ${prefix}/bin
|
|
||||||
mandir ?= ${prefix}/share/man
|
|
||||||
CFLAGS ?= -O2 -g -Wall -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2
|
|
||||||
-CFLAGS += $(KMOD_CFLAGS)
|
|
||||||
bashcompletiondir ?= ${datadir}/bash-completion/completions
|
|
||||||
pkgconfigdatadir ?= $(datadir)/pkgconfig
|
|
||||||
|
|
||||||
@@ -50,6 +49,9 @@ manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
|
|
||||||
|
|
||||||
all: dracut-version.sh dracut.pc dracut-install skipcpio/skipcpio
|
|
||||||
|
|
||||||
+%.o : %.c
|
|
||||||
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(KMOD_CFLAGS) $< -o $@
|
|
||||||
+
|
|
||||||
DRACUT_INSTALL_OBJECTS = \
|
|
||||||
install/dracut-install.o \
|
|
||||||
install/hashmap.o\
|
|
||||||
|
|
33
0030.patch
33
0030.patch
@ -1,33 +0,0 @@
|
|||||||
From defb1611c771d9f05780aebb101baefde2f66874 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sebastian Mitterle <smitterl@redhat.com>
|
|
||||||
Date: Thu, 19 Mar 2020 12:12:50 +0100
|
|
||||||
Subject: [PATCH] dasd: only install /etc/dasd.conf if present
|
|
||||||
|
|
||||||
`dasd.conf` needn't be present on system even if modules have been loaded.
|
|
||||||
|
|
||||||
Check if file exists to avoid error message during kernel update
|
|
||||||
```bash
|
|
||||||
dracut-install: ERROR: installing '/etc/dasd.conf'
|
|
||||||
dracut: FAILED: /usr/lib/dracut/dracut-install -D /var/tmp/dracut.YvVRx5/initramfs -H /etc/dasd.conf
|
|
||||||
```
|
|
||||||
---
|
|
||||||
modules.d/95dasd/module-setup.sh | 5 +++--
|
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh
|
|
||||||
index 2c49cd26..c71c8a08 100755
|
|
||||||
--- a/modules.d/95dasd/module-setup.sh
|
|
||||||
+++ b/modules.d/95dasd/module-setup.sh
|
|
||||||
@@ -18,8 +18,9 @@ depends() {
|
|
||||||
install() {
|
|
||||||
inst_hook cmdline 30 "$moddir/parse-dasd.sh"
|
|
||||||
inst_multiple dasdinfo dasdconf.sh normalize_dasd_arg
|
|
||||||
- if [[ $hostonly ]]; then
|
|
||||||
- inst -H /etc/dasd.conf
|
|
||||||
+ conf=/etc/dasd.conf
|
|
||||||
+ if [[ $hostonly && -f $conf ]] ; then
|
|
||||||
+ inst -H $conf
|
|
||||||
fi
|
|
||||||
inst_rules 56-dasd.rules
|
|
||||||
inst_rules 59-dasd.rules
|
|
||||||
|
|
35
0031.patch
35
0031.patch
@ -1,35 +0,0 @@
|
|||||||
From b68930ed3dd29184f3e6c87582377e7501b3b276 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Patrick Talbert <ptalbert@redhat.com>
|
|
||||||
Date: Wed, 18 Mar 2020 15:58:48 +0100
|
|
||||||
Subject: [PATCH] dhclient-script: Fix typo in output of BOUND & BOUND6 cases
|
|
||||||
|
|
||||||
No bonding going on here.
|
|
||||||
|
|
||||||
Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
|
|
||||||
---
|
|
||||||
modules.d/35network-legacy/dhclient-script.sh | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/35network-legacy/dhclient-script.sh b/modules.d/35network-legacy/dhclient-script.sh
|
|
||||||
index 84b65e89..fd92752b 100755
|
|
||||||
--- a/modules.d/35network-legacy/dhclient-script.sh
|
|
||||||
+++ b/modules.d/35network-legacy/dhclient-script.sh
|
|
||||||
@@ -164,7 +164,7 @@ case $reason in
|
|
||||||
;;
|
|
||||||
|
|
||||||
BOUND)
|
|
||||||
- echo "dhcp: BOND setting $netif"
|
|
||||||
+ echo "dhcp: BOUND setting up $netif"
|
|
||||||
unset layer2
|
|
||||||
if [ -f /sys/class/net/$netif/device/layer2 ]; then
|
|
||||||
read layer2 < /sys/class/net/$netif/device/layer2
|
|
||||||
@@ -223,7 +223,7 @@ case $reason in
|
|
||||||
;;
|
|
||||||
|
|
||||||
BOUND6)
|
|
||||||
- echo "dhcp: BOND6 setting $netif"
|
|
||||||
+ echo "dhcp: BOUND6 setting up $netif"
|
|
||||||
setup_interface6
|
|
||||||
|
|
||||||
set | while read line || [ -n "$line" ]; do
|
|
||||||
|
|
33
0032.patch
33
0032.patch
@ -1,33 +0,0 @@
|
|||||||
From 3a043feea1d1d1d1d01762d95b725b9adef61562 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Sosedkin <asosedkin@redhat.com>
|
|
||||||
Date: Thu, 26 Mar 2020 15:11:15 +0100
|
|
||||||
Subject: [PATCH] url-lib: drop NSS if it's not in curl --version
|
|
||||||
|
|
||||||
---
|
|
||||||
modules.d/45url-lib/module-setup.sh | 12 +++++++-----
|
|
||||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/45url-lib/module-setup.sh b/modules.d/45url-lib/module-setup.sh
|
|
||||||
index a99e0c56..258a9e16 100755
|
|
||||||
--- a/modules.d/45url-lib/module-setup.sh
|
|
||||||
+++ b/modules.d/45url-lib/module-setup.sh
|
|
||||||
@@ -19,11 +19,13 @@ install() {
|
|
||||||
inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh"
|
|
||||||
inst_multiple -o ctorrent
|
|
||||||
inst_multiple curl
|
|
||||||
- # also install libs for curl https
|
|
||||||
- inst_libdir_file "libnsspem.so*"
|
|
||||||
- inst_libdir_file "libnsssysinit.so*"
|
|
||||||
- inst_libdir_file "libsoftokn3.so*"
|
|
||||||
- inst_libdir_file "libsqlite3.so*"
|
|
||||||
+ if curl --version | grep -qi '\bNSS\b'; then
|
|
||||||
+ # also install libs for curl https
|
|
||||||
+ inst_libdir_file "libnsspem.so*"
|
|
||||||
+ inst_libdir_file "libnsssysinit.so*"
|
|
||||||
+ inst_libdir_file "libsoftokn3.so*"
|
|
||||||
+ inst_libdir_file "libsqlite3.so*"
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
for _dir in $libdirs; do
|
|
||||||
[[ -d $dracutsysrootdir$_dir ]] || continue
|
|
||||||
|
|
100
0033.patch
100
0033.patch
@ -1,100 +0,0 @@
|
|||||||
From b8a92b715677d52dbc2b27a710b9816fd8b9a63b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ben Howard <ben.howard@redhat.com>
|
|
||||||
Date: Fri, 3 Apr 2020 13:32:44 -0600
|
|
||||||
Subject: [PATCH] multipath: add automatic configuration for multipath
|
|
||||||
|
|
||||||
Add support for 'rd.multipath=default' for using the default
|
|
||||||
configuration on boot. The intended purpose for this is to help support
|
|
||||||
ostree-based image boots from multipathed devices (such as Fedora and
|
|
||||||
Red Hat CoreOS).
|
|
||||||
---
|
|
||||||
dracut.cmdline.7.asc | 3 +++
|
|
||||||
modules.d/90multipath/module-setup.sh | 7 +++++--
|
|
||||||
modules.d/90multipath/multipathd-configure.service | 19 +++++++++++++++++++
|
|
||||||
modules.d/90multipath/multipathd.sh | 5 +++++
|
|
||||||
4 files changed, 32 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
|
|
||||||
index 646f1f03..63074353 100644
|
|
||||||
--- a/dracut.cmdline.7.asc
|
|
||||||
+++ b/dracut.cmdline.7.asc
|
|
||||||
@@ -431,6 +431,9 @@ MULTIPATH
|
|
||||||
**rd.multipath=0**::
|
|
||||||
disable multipath detection
|
|
||||||
|
|
||||||
+**rd.multipath=default**::
|
|
||||||
+ use default multipath settings
|
|
||||||
+
|
|
||||||
FIPS
|
|
||||||
~~~~
|
|
||||||
**rd.fips**::
|
|
||||||
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
|
|
||||||
index 48a9d09a..2bb7444b 100755
|
|
||||||
--- a/modules.d/90multipath/module-setup.sh
|
|
||||||
+++ b/modules.d/90multipath/module-setup.sh
|
|
||||||
@@ -83,11 +83,12 @@ install() {
|
|
||||||
dmsetup \
|
|
||||||
kpartx \
|
|
||||||
mpath_wait \
|
|
||||||
+ mpathconf \
|
|
||||||
+ mpathpersist \
|
|
||||||
multipath \
|
|
||||||
multipathd \
|
|
||||||
- mpathpersist \
|
|
||||||
- xdrgetuid \
|
|
||||||
xdrgetprio \
|
|
||||||
+ xdrgetuid \
|
|
||||||
/etc/xdrdevices.conf \
|
|
||||||
/etc/multipath.conf \
|
|
||||||
/etc/multipath/* \
|
|
||||||
@@ -109,7 +110,9 @@ install() {
|
|
||||||
fi
|
|
||||||
|
|
||||||
if dracut_module_included "systemd"; then
|
|
||||||
+ inst_simple "${moddir}/multipathd-configure.service" "${systemdsystemunitdir}/multipathd-configure.service"
|
|
||||||
inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service"
|
|
||||||
+ systemctl -q --root "$initdir" enable multipathd-configure.service
|
|
||||||
systemctl -q --root "$initdir" enable multipathd.service
|
|
||||||
else
|
|
||||||
inst_hook pre-trigger 02 "$moddir/multipathd.sh"
|
|
||||||
diff --git a/modules.d/90multipath/multipathd-configure.service b/modules.d/90multipath/multipathd-configure.service
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..de690615
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/modules.d/90multipath/multipathd-configure.service
|
|
||||||
@@ -0,0 +1,19 @@
|
|
||||||
+[Unit]
|
|
||||||
+Description=Device-Mapper Multipath Default Configuration
|
|
||||||
+Before=iscsi.service iscsid.service lvm2-activation-early.service
|
|
||||||
+Wants=systemd-udev-trigger.service systemd-udev-settle.service local-fs-pre.target
|
|
||||||
+After=systemd-udev-trigger.service systemd-udev-settle.service
|
|
||||||
+Before=local-fs-pre.target multipathd.service
|
|
||||||
+DefaultDependencies=no
|
|
||||||
+Conflicts=shutdown.target
|
|
||||||
+
|
|
||||||
+ConditionKernelCommandLine=rd.multipath=default
|
|
||||||
+ConditionPathExists=!/etc/multipath.conf
|
|
||||||
+
|
|
||||||
+[Service]
|
|
||||||
+Type=oneshot
|
|
||||||
+ExecStartPre=-/usr/bin/mkdir -p /etc/multipath/multipath.conf.d
|
|
||||||
+ExecStart=/usr/sbin/mpathconf --enable
|
|
||||||
+
|
|
||||||
+[Install]
|
|
||||||
+WantedBy=sysinit.target
|
|
||||||
diff --git a/modules.d/90multipath/multipathd.sh b/modules.d/90multipath/multipathd.sh
|
|
||||||
index 2c2dcc85..936c5dc7 100755
|
|
||||||
--- a/modules.d/90multipath/multipathd.sh
|
|
||||||
+++ b/modules.d/90multipath/multipathd.sh
|
|
||||||
@@ -1,5 +1,10 @@
|
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
+if [ "$(getarg rd.multipath)x" == "default" ] && [ ! -e /etc/multipath.conf ]; then
|
|
||||||
+ mkdir -p /etc/multipath/multipath.conf.d
|
|
||||||
+ mpathconf --enable
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
if getargbool 1 rd.multipath -d -n rd_NO_MULTIPATH && [ -e /etc/multipath.conf ]; then
|
|
||||||
modprobe dm-multipath
|
|
||||||
multipathd -B || multipathd
|
|
||||||
|
|
24
0034.patch
24
0034.patch
@ -1,24 +0,0 @@
|
|||||||
From 3b626094bd5f017dee26968ce1531a301bb6218a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
||||||
Date: Tue, 7 Apr 2020 12:27:30 +0200
|
|
||||||
Subject: [PATCH] mkinitrd-suse.sh: Fix i586 platform detection
|
|
||||||
|
|
||||||
Reference: boo#1168341
|
|
||||||
---
|
|
||||||
mkinitrd-suse.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/mkinitrd-suse.sh b/mkinitrd-suse.sh
|
|
||||||
index db2eb188..708c4e67 100755
|
|
||||||
--- a/mkinitrd-suse.sh
|
|
||||||
+++ b/mkinitrd-suse.sh
|
|
||||||
@@ -171,7 +171,7 @@ default_kernel_images() {
|
|
||||||
ppc|ppc64)
|
|
||||||
regex='vmlinux'
|
|
||||||
;;
|
|
||||||
- i386|x86_64)
|
|
||||||
+ i?86|x86_64)
|
|
||||||
regex='vmlinuz'
|
|
||||||
;;
|
|
||||||
arm*)
|
|
||||||
|
|
23
0035.patch
23
0035.patch
@ -1,23 +0,0 @@
|
|||||||
From 11474b808b6fbd373b2ca6ce3350a024e6a8ea15 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Thu, 9 Apr 2020 22:05:41 +0200
|
|
||||||
Subject: [PATCH] TEST-99: exclude /etc/dnf/* from check
|
|
||||||
|
|
||||||
file /etc/dnf/modules.d/eclipse.module.rpmmoved is not owned by any package
|
|
||||||
---
|
|
||||||
test/TEST-99-RPM/test.sh | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
|
|
||||||
index af64c24a..504fd77f 100755
|
|
||||||
--- a/test/TEST-99-RPM/test.sh
|
|
||||||
+++ b/test/TEST-99-RPM/test.sh
|
|
||||||
@@ -84,6 +84,7 @@ find / -xdev -type f -not -path '/var/*' \
|
|
||||||
-not -path "/boot/loader/entries/\$(cat /etc/machine-id)-*" \
|
|
||||||
-not -path "/boot/\$(cat /etc/machine-id)/*" \
|
|
||||||
-not -path '/etc/openldap/certs/*' \
|
|
||||||
+ -not -path '/etc/dnf/*' \
|
|
||||||
-print0 | xargs -0 rpm -qf | \
|
|
||||||
grep -F 'not owned' &>> /test.output || :
|
|
||||||
exit 0
|
|
||||||
|
|
60
0036.patch
60
0036.patch
@ -1,60 +0,0 @@
|
|||||||
From 872eb69936bd849eec6d1974dd6569f23a7ad3db Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kairui Song <kasong@redhat.com>
|
|
||||||
Date: Thu, 5 Mar 2020 18:44:45 +0800
|
|
||||||
Subject: [PATCH] 95znet: Add a rd.znet_ifname= option
|
|
||||||
|
|
||||||
qeth device may have a different IP for each boot, so the rd.ifname=
|
|
||||||
option will no longer work. So for znet device, introduce a
|
|
||||||
rd.znet_ifname= options, to subchannel id instead of MAC address as the
|
|
||||||
identifier and rename the interface.
|
|
||||||
|
|
||||||
Signed-off-by: Kairui Song <kasong@redhat.com>
|
|
||||||
---
|
|
||||||
dracut.cmdline.7.asc | 5 +++++
|
|
||||||
modules.d/95znet/parse-ccw.sh | 18 ++++++++++++++++++
|
|
||||||
2 files changed, 23 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
|
|
||||||
index 63074353..2b38aa33 100644
|
|
||||||
--- a/dracut.cmdline.7.asc
|
|
||||||
+++ b/dracut.cmdline.7.asc
|
|
||||||
@@ -863,6 +863,11 @@ ZNET
|
|
||||||
RHEL/Fedora with ccw_init, which is called from udev for certain
|
|
||||||
devices on z-series.
|
|
||||||
rd.znet can be specified multiple times on the kernel command line.
|
|
||||||
+
|
|
||||||
+**rd.znet_ifname=**__<ifname>__:__<subchannels>__::
|
|
||||||
+ Assign network device name <interface> (i.e. "bootnet") to the NIC
|
|
||||||
+ corresponds to the subchannels. This is useful when dracut's default
|
|
||||||
+ "ifname=" doesn't work due to device having a changing MAC address.
|
|
||||||
+
|
|
||||||
[listing]
|
|
||||||
.Example
|
|
||||||
diff --git a/modules.d/95znet/parse-ccw.sh b/modules.d/95znet/parse-ccw.sh
|
|
||||||
index 7d40a1aa..59b588f3 100755
|
|
||||||
--- a/modules.d/95znet/parse-ccw.sh
|
|
||||||
+++ b/modules.d/95znet/parse-ccw.sh
|
|
||||||
@@ -4,4 +4,22 @@ for ccw_arg in $(getargs rd.ccw -d 'rd_CCW=') $(getargs rd.znet -d 'rd_ZNET=');
|
|
||||||
echo $ccw_arg >> /etc/ccw.conf
|
|
||||||
done
|
|
||||||
|
|
||||||
+for ifname in $(getargs rd.znet_ifname); do
|
|
||||||
+ IFS=: read ifname_if ifname_subchannels _rest <<< "$ifname"
|
|
||||||
+ if [ -z "$ifname_if" ] || [ -z "$ifname_subchannels" ] || [ -n "$_rest" ]; then
|
|
||||||
+ warn "Invalid arguments for rd.znet_ifname="
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ ifname_subchannels=${ifname_subchannels//,/|}
|
|
||||||
+
|
|
||||||
+ echo 'ACTION!="add|change", GOTO="ccw_ifname_end"'
|
|
||||||
+ echo 'ATTR{type}!="1", GOTO="ccw_ifname_end"'
|
|
||||||
+ echo 'SUBSYSTEM!="net", GOTO="ccw_ifname_end"'
|
|
||||||
+ echo "SUBSYSTEMS==\"ccwgroup\", KERNELS==\"$ifname_subchannels\", DRIVERS==\"?*\" NAME=\"$ifname_if\""
|
|
||||||
+ echo 'LABEL="ccw_ifname_end"'
|
|
||||||
+
|
|
||||||
+ } > /etc/udev/rules.d/81-ccw-ifname.rules
|
|
||||||
+ fi
|
|
||||||
+done
|
|
||||||
+
|
|
||||||
znet_cio_free
|
|
||||||
|
|
22
0037.patch
22
0037.patch
@ -1,22 +0,0 @@
|
|||||||
From 25c7a13985473ff9714245eaa602225b1a0f9ecb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Wilck <mwilck@suse.de>
|
|
||||||
Date: Wed, 25 Mar 2020 12:23:11 +0100
|
|
||||||
Subject: [PATCH] 90nvdimm: include nvdimm keys in initrd
|
|
||||||
|
|
||||||
This is necessary to actually unlock NVDIMM keys during boot.
|
|
||||||
---
|
|
||||||
modules.d/90nvdimm/module-setup.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90nvdimm/module-setup.sh b/modules.d/90nvdimm/module-setup.sh
|
|
||||||
index 6d58efd7..6d73d215 100755
|
|
||||||
--- a/modules.d/90nvdimm/module-setup.sh
|
|
||||||
+++ b/modules.d/90nvdimm/module-setup.sh
|
|
||||||
@@ -27,5 +27,5 @@ installkernel() {
|
|
||||||
|
|
||||||
# called by dracut
|
|
||||||
install() {
|
|
||||||
- inst_multiple -o ndctl
|
|
||||||
+ inst_multiple -o ndctl /etc/ndctl/keys/tpm.handle /etc/ndctl/keys/*.blob
|
|
||||||
}
|
|
||||||
|
|
109
0038.patch
109
0038.patch
@ -1,109 +0,0 @@
|
|||||||
From 8e1a4dc5f8a777fc718db490414ffdc9dc755f66 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jonas Witschel <diabonas@archlinux.org>
|
|
||||||
Date: Sat, 18 Apr 2020 14:55:41 +0200
|
|
||||||
Subject: [PATCH] dracut-lib.sh: quote variables in parameter expansion
|
|
||||||
patterns
|
|
||||||
|
|
||||||
According to POSIX.1-2017, 2.6.2 Parameter Expansion:
|
|
||||||
|
|
||||||
${parameter%[word]} [...] The word shall be expanded to produce a
|
|
||||||
pattern.
|
|
||||||
|
|
||||||
This means if word contains variables that itself contain special
|
|
||||||
characters like asterisks or backslashes, these are treated as pattern
|
|
||||||
characters unless the variable is quoted. Try e.g. the following example
|
|
||||||
in bash, dash or (busybox) ash:
|
|
||||||
|
|
||||||
i='a\c'; j='\'; echo "${i%$j*}"
|
|
||||||
|
|
||||||
This prints "a\c" because "$j*" is expanded to "\*", escaping the
|
|
||||||
asterisk. In contrast,
|
|
||||||
|
|
||||||
i='a\c'; j='\'; echo "${i%"$j"*}"
|
|
||||||
|
|
||||||
produces the expected result "a" because the backslash is not specially
|
|
||||||
treated any more after quoting.
|
|
||||||
|
|
||||||
The quotes that this commit adds have been previously removed in commit
|
|
||||||
f9c96cf56fed390841eac05c43826e62014c9188, citing issues with busybox
|
|
||||||
hush without further specifying the actual error. I tested a recent
|
|
||||||
busybox build (upstream commit 9aa751b08ab03d6396f86c3df77937a19687981b)
|
|
||||||
and couldn't find any problems. Note that the above example always
|
|
||||||
produces "a\c" in hush regardless of quoting $j, making hush unsuitable
|
|
||||||
for use with dracut, but using quotes in parameter expansions generally
|
|
||||||
works.
|
|
||||||
|
|
||||||
The unquoted variables break the "rd.luks.uuid/name" kernel command line
|
|
||||||
options in dracut 050 because
|
|
||||||
|
|
||||||
str_replace "$luksname" '\' '\\'
|
|
||||||
|
|
||||||
in modules.d/90crypt/parse-crypt.sh is not able to escape the
|
|
||||||
backslashes any more, see GH-723, GH-727: backslashes in the
|
|
||||||
systemd-cryptsetup@.service unit name stay unescaped for use in udev
|
|
||||||
(cf. commit 0f6d93eb9d63695a64002ec8b0421fbc9fc8a7a3), leading to
|
|
||||||
failures in starting the unit.
|
|
||||||
|
|
||||||
This partially reverts commit f9c96cf56fed390841eac05c43826e62014c9188.
|
|
||||||
---
|
|
||||||
modules.d/99base/dracut-lib.sh | 16 ++++++++--------
|
|
||||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
|
||||||
index c53cd13b..c57523d3 100755
|
|
||||||
--- a/modules.d/99base/dracut-lib.sh
|
|
||||||
+++ b/modules.d/99base/dracut-lib.sh
|
|
||||||
@@ -24,7 +24,7 @@ debug_on() {
|
|
||||||
|
|
||||||
# returns OK if $1 contains literal string $2 (and isn't empty)
|
|
||||||
strstr() {
|
|
||||||
- [ "${1##*$2*}" != "$1" ]
|
|
||||||
+ [ "${1##*"$2"*}" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# returns OK if $1 matches (completely) glob pattern $2
|
|
||||||
@@ -43,18 +43,18 @@ strglobin() {
|
|
||||||
|
|
||||||
# returns OK if $1 contains literal string $2 at the beginning, and isn't empty
|
|
||||||
str_starts() {
|
|
||||||
- [ "${1#$2*}" != "$1" ]
|
|
||||||
+ [ "${1#"$2"*}" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# returns OK if $1 contains literal string $2 at the end, and isn't empty
|
|
||||||
str_ends() {
|
|
||||||
- [ "${1%*$2}" != "$1" ]
|
|
||||||
+ [ "${1%*"$2"}" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
trim() {
|
|
||||||
local var="$*"
|
|
||||||
- var="${var#${var%%[![:space:]]*}}" # remove leading whitespace characters
|
|
||||||
- var="${var%${var##*[![:space:]]}}" # remove trailing whitespace characters
|
|
||||||
+ var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
|
|
||||||
+ var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
|
|
||||||
printf "%s" "$var"
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -108,9 +108,9 @@ str_replace() {
|
|
||||||
local out=''
|
|
||||||
|
|
||||||
while strstr "${in}" "$s"; do
|
|
||||||
- chop="${in%%$s*}"
|
|
||||||
+ chop="${in%%"$s"*}"
|
|
||||||
out="${out}${chop}$r"
|
|
||||||
- in="${in#*$s}"
|
|
||||||
+ in="${in#*"$s"}"
|
|
||||||
done
|
|
||||||
echo "${out}${in}"
|
|
||||||
}
|
|
||||||
@@ -396,7 +396,7 @@ splitsep() {
|
|
||||||
while [ -n "$str" -a "$#" -gt 1 ]; do
|
|
||||||
tmp="${str%%$sep*}"
|
|
||||||
eval "$1='${tmp}'"
|
|
||||||
- str="${str#$tmp}"
|
|
||||||
+ str="${str#"$tmp"}"
|
|
||||||
str="${str#$sep}"
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
50
0039.patch
50
0039.patch
@ -1,50 +0,0 @@
|
|||||||
From de34ba76e579dd11202f632ecf8c625f841646e1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
||||||
Date: Sun, 19 Apr 2020 16:32:41 +0300
|
|
||||||
Subject: [PATCH] i18n: Always install /etc/vconsole.conf
|
|
||||||
|
|
||||||
/etc/vconsole.conf must be installed always, even in generic initrds, not only host-only ones.
|
|
||||||
systemd-vconsole-setup is run at initrd stage and expects either /etc/vconsole.conf or kernel cmdline options to exist.
|
|
||||||
|
|
||||||
I have also proposed a change in systemd-vconsole-setup that makes it behave better if /etc/vconsole.conf does not exist:
|
|
||||||
https://github.com/systemd/systemd/pull/15479
|
|
||||||
But it is just a fallback. If /etc/vconsole.conf does not exist in initrd and if that patch is applied on systemd,
|
|
||||||
then the default consoel font is set despite the one being set in /etc/vconsole.conf and this setting is inherited
|
|
||||||
when new TTYs are opened. This leads to full ignorance of settings in /etc/vconsole.conf.
|
|
||||||
It is incorrect, and that is why this file must be copied to initrds always, but not only on host-only initrds.
|
|
||||||
|
|
||||||
Fixes: https://github.com/dracutdevs/dracut/issues/796
|
|
||||||
|
|
||||||
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
||||||
---
|
|
||||||
modules.d/10i18n/module-setup.sh | 9 ++++++---
|
|
||||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
|
|
||||||
index ba17e477..dd45b666 100755
|
|
||||||
--- a/modules.d/10i18n/module-setup.sh
|
|
||||||
+++ b/modules.d/10i18n/module-setup.sh
|
|
||||||
@@ -230,9 +230,7 @@ install() {
|
|
||||||
print_vars LC_ALL LANG >> ${initdir}${I18N_CONF}
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if dracut_module_included "systemd" && [[ -f $dracutsysrootdir${VCONFIG_CONF} ]]; then
|
|
||||||
- inst_simple ${VCONFIG_CONF}
|
|
||||||
- else
|
|
||||||
+ if ! dracut_module_included "systemd"; then
|
|
||||||
mksubdirs ${initdir}${VCONFIG_CONF}
|
|
||||||
print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF}
|
|
||||||
fi
|
|
||||||
@@ -263,6 +261,11 @@ install() {
|
|
||||||
if checks; then
|
|
||||||
install_base
|
|
||||||
|
|
||||||
+ # https://github.com/dracutdevs/dracut/issues/796
|
|
||||||
+ if dracut_module_included "systemd" && [[ -f $dracutsysrootdir${VCONFIG_CONF} ]]; then
|
|
||||||
+ inst_simple ${VCONFIG_CONF}
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} == "yes" ]]; then
|
|
||||||
install_local_i18n || install_all_kbd
|
|
||||||
else
|
|
||||||
|
|
23
0040.patch
23
0040.patch
@ -1,23 +0,0 @@
|
|||||||
From 3a4a212649bd89f5a07ccf87a53b3103094748a3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Mon, 20 Apr 2020 15:07:02 +0200
|
|
||||||
Subject: [PATCH] systemd: skip dependency add for non-existent units
|
|
||||||
|
|
||||||
Fixes: https://github.com/dracutdevs/dracut/issues/795
|
|
||||||
---
|
|
||||||
modules.d/00systemd/module-setup.sh | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
|
|
||||||
index 5ebdfc30..17be74fd 100755
|
|
||||||
--- a/modules.d/00systemd/module-setup.sh
|
|
||||||
+++ b/modules.d/00systemd/module-setup.sh
|
|
||||||
@@ -241,6 +241,7 @@ install() {
|
|
||||||
systemd-ask-password-console.service \
|
|
||||||
systemd-ask-password-plymouth.service \
|
|
||||||
; do
|
|
||||||
+ [[ -f $systemdsystemunitdir/$i ]] || continue
|
|
||||||
systemctl -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
29
0041.patch
29
0041.patch
@ -1,29 +0,0 @@
|
|||||||
From 87bffc36e72c121024df033e1a78799456c73523 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
||||||
Date: Mon, 23 Mar 2020 22:57:35 +0100
|
|
||||||
Subject: [PATCH] network-manager: install libnss DNS and mDNS plugins
|
|
||||||
|
|
||||||
Install libnss_dns.so and libnss_mdns4_minimal.so plugins for the Name
|
|
||||||
Service Switch (NSS) functionality of glibc so that name resolution
|
|
||||||
through /etc/resolv.conf and mDNS works in the initrd.
|
|
||||||
|
|
||||||
Fixes: #772
|
|
||||||
---
|
|
||||||
modules.d/35network-manager/module-setup.sh | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
|
|
||||||
index d6d0f9ce..8fc3114d 100755
|
|
||||||
--- a/modules.d/35network-manager/module-setup.sh
|
|
||||||
+++ b/modules.d/35network-manager/module-setup.sh
|
|
||||||
@@ -51,4 +51,9 @@ install() {
|
|
||||||
if ! [[ -d "$initdir/etc/sysconfig/network-scripts" ]]; then
|
|
||||||
inst_libdir_file "NetworkManager/$_nm_version/libnm-settings-plugin-ifcfg-rh.so"
|
|
||||||
fi
|
|
||||||
+
|
|
||||||
+ _arch=${DRACUT_ARCH:-$(uname -m)}
|
|
||||||
+
|
|
||||||
+ inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
|
|
||||||
+ {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"
|
|
||||||
}
|
|
||||||
|
|
422
0042.patch
422
0042.patch
@ -1,422 +0,0 @@
|
|||||||
From 49c4172f4eef6e2015615e132b199a7ec0699ffc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kairui Song <kasong@redhat.com>
|
|
||||||
Date: Wed, 8 Apr 2020 16:39:52 +0800
|
|
||||||
Subject: [PATCH] Remove memtrace-ko and rd.memdebug=4 support in dracut
|
|
||||||
|
|
||||||
This feature could be off loaded to memstrack, which have better
|
|
||||||
accurecy, better performance, and have more detailed tracing features.
|
|
||||||
|
|
||||||
Also simplify make_trace_mem a bit.
|
|
||||||
|
|
||||||
And currently rd.memdebug=4 is unstable, fails from time to time.
|
|
||||||
---
|
|
||||||
dracut.cmdline.7.asc | 4 +--
|
|
||||||
modules.d/98dracut-systemd/dracut-cmdline.sh | 2 +-
|
|
||||||
modules.d/98dracut-systemd/dracut-pre-mount.sh | 2 +-
|
|
||||||
modules.d/98dracut-systemd/dracut-pre-pivot.sh | 2 +-
|
|
||||||
modules.d/98dracut-systemd/dracut-pre-trigger.sh | 2 +-
|
|
||||||
modules.d/99base/dracut-lib.sh | 44 +++++-------------------
|
|
||||||
modules.d/99base/init.sh | 8 ++---
|
|
||||||
modules.d/99base/memtrace-ko.sh | 191 -----------------------------------------------------------------------------------------------------
|
|
||||||
modules.d/99base/module-setup.sh | 1 -
|
|
||||||
9 files changed, 18 insertions(+), 238 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
|
|
||||||
index 2b38aa33..c53601ea 100644
|
|
||||||
--- a/dracut.cmdline.7.asc
|
|
||||||
+++ b/dracut.cmdline.7.asc
|
|
||||||
@@ -188,9 +188,9 @@ It should be attached to any report about dracut problems.
|
|
||||||
_/run/initramfs/init.log_.
|
|
||||||
If "quiet" is set, it also logs to the console.
|
|
||||||
|
|
||||||
-**rd.memdebug=[0-4]**::
|
|
||||||
+**rd.memdebug=[0-3]**::
|
|
||||||
Print memory usage info at various points, set the verbose level from 0 to 4.
|
|
||||||
-+
|
|
||||||
++
|
|
||||||
Higher level means more debugging output:
|
|
||||||
+
|
|
||||||
----
|
|
||||||
diff --git a/modules.d/98dracut-systemd/dracut-cmdline.sh b/modules.d/98dracut-systemd/dracut-cmdline.sh
|
|
||||||
index bff9435a..6c6ee026 100755
|
|
||||||
--- a/modules.d/98dracut-systemd/dracut-cmdline.sh
|
|
||||||
+++ b/modules.d/98dracut-systemd/dracut-cmdline.sh
|
|
||||||
@@ -42,7 +42,7 @@ export root
|
|
||||||
export rflags
|
|
||||||
export fstype
|
|
||||||
|
|
||||||
-make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab' '4+:komem'
|
|
||||||
+make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab'
|
|
||||||
# run scriptlets to parse the command line
|
|
||||||
getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline"
|
|
||||||
source_hook cmdline
|
|
||||||
diff --git a/modules.d/98dracut-systemd/dracut-pre-mount.sh b/modules.d/98dracut-systemd/dracut-pre-mount.sh
|
|
||||||
index a3b9d291..ae511286 100755
|
|
||||||
--- a/modules.d/98dracut-systemd/dracut-pre-mount.sh
|
|
||||||
+++ b/modules.d/98dracut-systemd/dracut-pre-mount.sh
|
|
||||||
@@ -8,7 +8,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
|
||||||
|
|
||||||
source_conf /etc/conf.d
|
|
||||||
|
|
||||||
-make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
|
|
||||||
+make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab'
|
|
||||||
# pre pivot scripts are sourced just before we doing cleanup and switch over
|
|
||||||
# to the new root.
|
|
||||||
getarg 'rd.break=pre-mount' 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break pre-mount"
|
|
||||||
diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.sh b/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
||||||
index dc9a2504..96e6f8ca 100755
|
|
||||||
--- a/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
||||||
+++ b/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
||||||
@@ -8,7 +8,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
|
||||||
|
|
||||||
source_conf /etc/conf.d
|
|
||||||
|
|
||||||
-make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
|
|
||||||
+make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab'
|
|
||||||
# pre pivot scripts are sourced just before we doing cleanup and switch over
|
|
||||||
# to the new root.
|
|
||||||
getarg 'rd.break=pre-pivot' 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break pre-pivot"
|
|
||||||
diff --git a/modules.d/98dracut-systemd/dracut-pre-trigger.sh b/modules.d/98dracut-systemd/dracut-pre-trigger.sh
|
|
||||||
index 7cd821ed..a1a33960 100755
|
|
||||||
--- a/modules.d/98dracut-systemd/dracut-pre-trigger.sh
|
|
||||||
+++ b/modules.d/98dracut-systemd/dracut-pre-trigger.sh
|
|
||||||
@@ -8,7 +8,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
|
||||||
|
|
||||||
source_conf /etc/conf.d
|
|
||||||
|
|
||||||
-make_trace_mem "hook pre-trigger" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
|
|
||||||
+make_trace_mem "hook pre-trigger" '1:shortmem' '2+:mem' '3+:slab'
|
|
||||||
|
|
||||||
source_hook pre-trigger
|
|
||||||
|
|
||||||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
|
||||||
index c57523d3..b7020892 100755
|
|
||||||
--- a/modules.d/99base/dracut-lib.sh
|
|
||||||
+++ b/modules.d/99base/dracut-lib.sh
|
|
||||||
@@ -1187,50 +1187,25 @@ are_lists_eq() {
|
|
||||||
|
|
||||||
setmemdebug() {
|
|
||||||
if [ -z "$DEBUG_MEM_LEVEL" ]; then
|
|
||||||
- export DEBUG_MEM_LEVEL=$(getargnum 0 0 4 rd.memdebug)
|
|
||||||
+ export DEBUG_MEM_LEVEL=$(getargnum 0 0 3 rd.memdebug)
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
setmemdebug
|
|
||||||
|
|
||||||
-cleanup_trace_mem()
|
|
||||||
-{
|
|
||||||
- # tracekomem based on kernel trace needs cleanup after use.
|
|
||||||
- if [ "$DEBUG_MEM_LEVEL" -eq 4 ]; then
|
|
||||||
- tracekomem --cleanup
|
|
||||||
- fi
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-# parameters: msg [trace_level:trace]...
|
|
||||||
-make_trace_mem()
|
|
||||||
-{
|
|
||||||
- local msg
|
|
||||||
- msg="$1"
|
|
||||||
- shift
|
|
||||||
- if [ -n "$DEBUG_MEM_LEVEL" ] && [ "$DEBUG_MEM_LEVEL" -gt 0 ]; then
|
|
||||||
- make_trace show_memstats $DEBUG_MEM_LEVEL "[debug_mem]" "$msg" "$@" >&2
|
|
||||||
- fi
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
# parameters: func log_level prefix msg [trace_level:trace]...
|
|
||||||
-make_trace()
|
|
||||||
+make_trace_mem()
|
|
||||||
{
|
|
||||||
- local func log_level prefix msg msg_printed
|
|
||||||
+ local log_level prefix msg msg_printed
|
|
||||||
local trace trace_level trace_in_higher_levels insert_trace
|
|
||||||
|
|
||||||
- func=$1
|
|
||||||
- shift
|
|
||||||
-
|
|
||||||
- log_level=$1
|
|
||||||
- shift
|
|
||||||
-
|
|
||||||
- prefix=$1
|
|
||||||
- shift
|
|
||||||
-
|
|
||||||
msg=$1
|
|
||||||
shift
|
|
||||||
|
|
||||||
- if [ -z "$log_level" ]; then
|
|
||||||
+ prefix='[debug_mem]'
|
|
||||||
+ log_level=$DEBUG_MEM_LEVEL
|
|
||||||
+
|
|
||||||
+ if [ -z "$log_level" ] || [ "$log_level" -le 0 ]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -1263,7 +1238,7 @@ make_trace()
|
|
||||||
echo "$prefix $msg"
|
|
||||||
msg_printed=1
|
|
||||||
fi
|
|
||||||
- $func $trace
|
|
||||||
+ show_memstats $trace
|
|
||||||
fi
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
@@ -1285,9 +1260,6 @@ show_memstats()
|
|
||||||
iomem)
|
|
||||||
cat /proc/iomem
|
|
||||||
;;
|
|
||||||
- komem)
|
|
||||||
- tracekomem
|
|
||||||
- ;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
|
|
||||||
index 1111d09b..148ce831 100755
|
|
||||||
--- a/modules.d/99base/init.sh
|
|
||||||
+++ b/modules.d/99base/init.sh
|
|
||||||
@@ -131,7 +131,7 @@ if ! getargbool 1 'rd.hostonly'; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
# run scriptlets to parse the command line
|
|
||||||
-make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab' '4+:komem'
|
|
||||||
+make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab'
|
|
||||||
getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline"
|
|
||||||
source_hook cmdline
|
|
||||||
|
|
||||||
@@ -160,7 +160,7 @@ fi
|
|
||||||
|
|
||||||
udevproperty "hookdir=$hookdir"
|
|
||||||
|
|
||||||
-make_trace_mem "hook pre-trigger" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
|
|
||||||
+make_trace_mem "hook pre-trigger" '1:shortmem' '2+:mem' '3+:slab'
|
|
||||||
getarg 'rd.break=pre-trigger' -d 'rdbreak=pre-trigger' && emergency_shell -n pre-trigger "Break before pre-trigger"
|
|
||||||
source_hook pre-trigger
|
|
||||||
|
|
||||||
@@ -230,7 +230,7 @@ unset RDRETRY
|
|
||||||
|
|
||||||
# pre-mount happens before we try to mount the root filesystem,
|
|
||||||
# and happens once.
|
|
||||||
-make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
|
|
||||||
+make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab'
|
|
||||||
getarg 'rd.break=pre-mount' -d 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break pre-mount"
|
|
||||||
source_hook pre-mount
|
|
||||||
|
|
||||||
@@ -266,7 +266,7 @@ done
|
|
||||||
|
|
||||||
# pre pivot scripts are sourced just before we doing cleanup and switch over
|
|
||||||
# to the new root.
|
|
||||||
-make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
|
|
||||||
+make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab'
|
|
||||||
getarg 'rd.break=pre-pivot' -d 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break pre-pivot"
|
|
||||||
source_hook pre-pivot
|
|
||||||
|
|
||||||
diff --git a/modules.d/99base/memtrace-ko.sh b/modules.d/99base/memtrace-ko.sh
|
|
||||||
deleted file mode 100755
|
|
||||||
index ee035e15..00000000
|
|
||||||
--- a/modules.d/99base/memtrace-ko.sh
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1,191 +0,0 @@
|
|
||||||
-#!/bin/sh
|
|
||||||
-
|
|
||||||
-# Try to find out kernel modules with large total memory allocation during loading.
|
|
||||||
-# For large slab allocation, it will fall into buddy, also not trace "mm_page_free"
|
|
||||||
-# considering large free is quite rare for module_init, thus saving tons of events
|
|
||||||
-# to avoid trace data overwritten.
|
|
||||||
-#
|
|
||||||
-# Therefore, tracing "mm_page_alloc"alone should be enough for the purpose.
|
|
||||||
-
|
|
||||||
-# "sys/kernel/tracing" has the priority if exists.
|
|
||||||
-get_trace_base() {
|
|
||||||
- # trace access through debugfs would be obsolete if "/sys/kernel/tracing" is available.
|
|
||||||
- if [ -d "/sys/kernel/tracing" ]; then
|
|
||||||
- echo "/sys/kernel"
|
|
||||||
- else
|
|
||||||
- echo "/sys/kernel/debug"
|
|
||||||
- fi
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-# We want to enable these trace events.
|
|
||||||
-get_want_events() {
|
|
||||||
- echo "module:module_put module:module_load kmem:mm_page_alloc"
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-get_event_filter() {
|
|
||||||
- echo "comm == systemd-udevd || comm == modprobe || comm == insmod"
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-is_trace_ready() {
|
|
||||||
- local trace_base want_events current_events
|
|
||||||
-
|
|
||||||
- trace_base=$(get_trace_base)
|
|
||||||
- ! [ -f "$trace_base/tracing/trace" ] && return 1
|
|
||||||
-
|
|
||||||
- [ "$(cat $trace_base/tracing/tracing_on)" -eq 0 ] && return 1
|
|
||||||
-
|
|
||||||
- # Also check if trace events were properly setup.
|
|
||||||
- want_events=$(get_want_events)
|
|
||||||
- current_events=$(echo $(cat $trace_base/tracing/set_event))
|
|
||||||
- [ "$current_events" != "$want_events" ] && return 1
|
|
||||||
-
|
|
||||||
- return 0
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-prepare_trace() {
|
|
||||||
- local trace_base
|
|
||||||
-
|
|
||||||
- trace_base=$(get_trace_base)
|
|
||||||
- # old debugfs interface case.
|
|
||||||
- if ! [ -d "$trace_base/tracing" ]; then
|
|
||||||
- mount none -t debugfs $trace_base
|
|
||||||
- # new tracefs interface case.
|
|
||||||
- elif ! [ -f "$trace_base/tracing/trace" ]; then
|
|
||||||
- mount none -t tracefs "$trace_base/tracing"
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- if ! [ -f "$trace_base/tracing/trace" ]; then
|
|
||||||
- echo "WARN: Mount trace failed for kernel module memory analyzing."
|
|
||||||
- return 1
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- # Active all the wanted trace events.
|
|
||||||
- echo "$(get_want_events)" > $trace_base/tracing/set_event
|
|
||||||
-
|
|
||||||
- # There are three kinds of known applications for module loading:
|
|
||||||
- # "systemd-udevd", "modprobe" and "insmod".
|
|
||||||
- # Set them as the global events filter.
|
|
||||||
- # NOTE: Some kernel may not support this format of filter, anyway
|
|
||||||
- # the operation will fail and it doesn't matter.
|
|
||||||
- echo "$(get_event_filter)" > $trace_base/tracing/events/kmem/filter 2>&1
|
|
||||||
- echo "$(get_event_filter)" > $trace_base/tracing/events/module/filter 2>&1
|
|
||||||
-
|
|
||||||
- # Set the number of comm-pid if supported.
|
|
||||||
- if [ -f "$trace_base/tracing/saved_cmdlines_size" ]; then
|
|
||||||
- # Thanks to filters, 4096 is big enough(also well supported).
|
|
||||||
- echo 4096 > $trace_base/tracing/saved_cmdlines_size
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- # Enable and clear trace data for the first time.
|
|
||||||
- echo 1 > $trace_base/tracing/tracing_on
|
|
||||||
- echo > $trace_base/tracing/trace
|
|
||||||
- echo "Prepare trace success."
|
|
||||||
- return 0
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-order_to_pages()
|
|
||||||
-{
|
|
||||||
- local pages=1
|
|
||||||
- local order=$1
|
|
||||||
-
|
|
||||||
- while [ "$order" != 0 ]; do
|
|
||||||
- order=$((order-1))
|
|
||||||
- pages=$(($pages*2))
|
|
||||||
- done
|
|
||||||
-
|
|
||||||
- echo $pages
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-parse_trace_data() {
|
|
||||||
- local module_name tmp_eval pages
|
|
||||||
-
|
|
||||||
- cat "$(get_trace_base)/tracing/trace" | while read pid cpu flags ts function args
|
|
||||||
- do
|
|
||||||
- # Skip comment lines
|
|
||||||
- if [ "$pid" = "#" ]; then
|
|
||||||
- continue
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- pid=${pid##*-}
|
|
||||||
- function=${function%:}
|
|
||||||
- if [ "$function" = "module_load" ]; then
|
|
||||||
- # One module is being loaded, save the task pid for tracking.
|
|
||||||
- # Remove the trailing after whitespace, there may be the module flags.
|
|
||||||
- module_name=${args%% *}
|
|
||||||
- # Mark current_module to track the task.
|
|
||||||
- eval current_module_$pid="$module_name"
|
|
||||||
- tmp_eval=$(eval echo '${module_loaded_'${module_name}'}')
|
|
||||||
- if [ -n "$tmp_eval" ]; then
|
|
||||||
- echo "WARN: \"$module_name\" was loaded multiple times!"
|
|
||||||
- fi
|
|
||||||
- eval unset module_loaded_$module_name
|
|
||||||
- eval nr_alloc_pages_$module_name=0
|
|
||||||
- continue
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- module_name=$(eval echo '${current_module_'${pid}'}')
|
|
||||||
- if [ -z "$module_name" ]; then
|
|
||||||
- continue
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- # Once we get here, the task is being tracked(is loading a module).
|
|
||||||
- if [ "$function" = "module_put" ]; then
|
|
||||||
- # Mark the module as loaded when the first module_put event happens after module_load.
|
|
||||||
- tmp_eval=$(eval echo '${nr_alloc_pages_'${module_name}'}')
|
|
||||||
- echo "$tmp_eval pages consumed by \"$module_name\""
|
|
||||||
- eval module_loaded_$module_name=1
|
|
||||||
- # Module loading finished, so untrack the task.
|
|
||||||
- eval unset current_module_$pid
|
|
||||||
- eval unset nr_alloc_pages_$module_name
|
|
||||||
- continue
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- if [ "$function" = "mm_page_alloc" ]; then
|
|
||||||
- # Get order first, then convert to actual pages.
|
|
||||||
- pages=$(echo $args | sed -e 's/.*order=\([0-9]*\) .*/\1/')
|
|
||||||
- pages=$(order_to_pages "$pages")
|
|
||||||
- tmp_eval=$(eval echo '${nr_alloc_pages_'${module_name}'}')
|
|
||||||
- eval nr_alloc_pages_$module_name="$(($tmp_eval+$pages))"
|
|
||||||
- fi
|
|
||||||
- done
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-cleanup_trace() {
|
|
||||||
- local trace_base
|
|
||||||
-
|
|
||||||
- if is_trace_ready; then
|
|
||||||
- trace_base=$(get_trace_base)
|
|
||||||
- echo 0 > $trace_base/tracing/tracing_on
|
|
||||||
- echo > $trace_base/tracing/trace
|
|
||||||
- echo > $trace_base/tracing/set_event
|
|
||||||
- echo 0 > $trace_base/tracing/events/kmem/filter
|
|
||||||
- echo 0 > $trace_base/tracing/events/module/filter
|
|
||||||
- fi
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-show_usage() {
|
|
||||||
- echo "Find out kernel modules with large memory consumption during loading based on trace."
|
|
||||||
- echo "Usage:"
|
|
||||||
- echo "1) run it first to setup trace."
|
|
||||||
- echo "2) run again to parse the trace data if any."
|
|
||||||
- echo "3) run with \"--cleanup\" option to cleanup trace after use."
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-if [ "$1" = "--help" ]; then
|
|
||||||
- show_usage
|
|
||||||
- exit 0
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-if [ "$1" = "--cleanup" ]; then
|
|
||||||
- cleanup_trace
|
|
||||||
- exit 0
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-if is_trace_ready ; then
|
|
||||||
- echo "tracekomem - Rough memory consumption by loading kernel modules (larger value with better accuracy)"
|
|
||||||
- parse_trace_data
|
|
||||||
-else
|
|
||||||
- prepare_trace
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-exit $?
|
|
||||||
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
|
|
||||||
index 3a2246b4..c9e3ebcb 100755
|
|
||||||
--- a/modules.d/99base/module-setup.sh
|
|
||||||
+++ b/modules.d/99base/module-setup.sh
|
|
||||||
@@ -39,7 +39,6 @@ install() {
|
|
||||||
inst_script "$moddir/initqueue.sh" "/sbin/initqueue"
|
|
||||||
inst_script "$moddir/loginit.sh" "/sbin/loginit"
|
|
||||||
inst_script "$moddir/rdsosreport.sh" "/sbin/rdsosreport"
|
|
||||||
- inst_script "$moddir/memtrace-ko.sh" "/sbin/tracekomem"
|
|
||||||
|
|
||||||
[ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib
|
|
||||||
mkdir -m 0755 -p ${initdir}/lib/dracut
|
|
||||||
|
|
316
0043.patch
316
0043.patch
@ -1,316 +0,0 @@
|
|||||||
From 7dd8a2f4d351ce8975c0af122732a2a12697c8cc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kairui Song <kasong@redhat.com>
|
|
||||||
Date: Wed, 8 Apr 2020 20:09:38 +0800
|
|
||||||
Subject: [PATCH] Add 99memstrack module
|
|
||||||
|
|
||||||
memstrack is a new tool to track the overall memory usage and
|
|
||||||
allocation, which can help off load the improve the builtin module
|
|
||||||
memory tracing function in dracut.
|
|
||||||
|
|
||||||
With this change, the rd.memdebug=4 behavior is similiar with before,
|
|
||||||
but the report is defered to pre-pivot, so the memory usage info
|
|
||||||
during the whole initramfs run is traced. And the ourput format is
|
|
||||||
changed a bit:
|
|
||||||
|
|
||||||
dracut-pre-pivot[519]: ======== Report format module_summary: ========
|
|
||||||
dracut-pre-pivot[519]: Module squashfs using 10.4MB (2658 pages), peak allocation 10.4MB (2671 pages)
|
|
||||||
dracut-pre-pivot[519]: Module qxl using 3.4MB (865 pages), peak allocation 3.4MB (880 pages)
|
|
||||||
dracut-pre-pivot[519]: Module crc32c_intel using 2.0MB (519 pages), peak allocation 3.0MB (769 pages)
|
|
||||||
dracut-pre-pivot[519]: Module serio_raw using 2.0MB (505 pages), peak allocation 3.6MB (918 pages)
|
|
||||||
dracut-pre-pivot[519]: Module virtio_console using 1.6MB (416 pages), peak allocation 1.6MB (419 pages)
|
|
||||||
... snip ...
|
|
||||||
dracut-pre-pivot[519]: ======== Report format module_summary END ========
|
|
||||||
|
|
||||||
It now contains more detail and also includes the peak usage which could
|
|
||||||
be more helpful.
|
|
||||||
|
|
||||||
And now it have a rd.memdebug=5, which will print more detail about
|
|
||||||
the stack trace of the top memory user, also printed on pri-pivot:
|
|
||||||
|
|
||||||
dracut-pre-pivot[519]: ======== Report format module_top: ========
|
|
||||||
dracut-pre-pivot[519]: Top stack usage of module squashfs:
|
|
||||||
dracut-pre-pivot[519]: (null) Pages: 2658 (peak: 2671)
|
|
||||||
dracut-pre-pivot[519]: (null) Pages: 2658 (peak: 2671)
|
|
||||||
dracut-pre-pivot[519]: async_page_fault (0xffffffff81a01149) Pages: 1448 (peak: 1461)
|
|
||||||
dracut-pre-pivot[519]: do_async_page_fault (0xffffffff8105c509) Pages: 1448 (peak: 1461)
|
|
||||||
dracut-pre-pivot[519]: do_page_fault (0xffffffff8106296a) Pages: 1448 (peak: 1461)
|
|
||||||
dracut-pre-pivot[519]: do_user_addr_fault (0xffffffff810626bd) Pages: 1448 (peak: 1461)
|
|
||||||
dracut-pre-pivot[519]: handle_mm_fault (0xffffffff812940c4) Pages: 1448 (peak: 1461)
|
|
||||||
dracut-pre-pivot[519]: __handle_mm_fault (0xffffffff81293627) Pages: 1195 (peak: 1208)
|
|
||||||
dracut-pre-pivot[519]: __do_fault (0xffffffff8128b07e) Pages: 1195 (peak: 1208)
|
|
||||||
dracut-pre-pivot[519]: filemap_fault (0xffffffff8124c0b9) Pages: 1195 (peak: 1208)
|
|
||||||
dracut-pre-pivot[519]: __do_page_cache_readahead (0xffffffff812585da) Pages: 1063 (peak: 1076)
|
|
||||||
dracut-pre-pivot[519]: read_pages (0xffffffff812583c2) Pages: 1063 (peak: 1076)
|
|
||||||
dracut-pre-pivot[519]: squashfs_readpage squashfs (0xffffffffc0022073) Pages: 1039 (peak: 1052)
|
|
||||||
dracut-pre-pivot[519]: squashfs_readpage_block squashfs (0xffffffffc0024334) Pages: 744 (peak: 744)
|
|
||||||
dracut-pre-pivot[519]: squashfs_copy_cache squashfs (0xffffffffc0021a3f) Pages: 744 (peak: 744)
|
|
||||||
dracut-pre-pivot[519]: pagecache_get_page (0xffffffff8124abf7) Pages: 744 (peak: 744)
|
|
||||||
dracut-pre-pivot[519]: __page_cache_alloc (0xffffffff81247df6) Pages: 744 (peak: 744)
|
|
||||||
dracut-pre-pivot[519]: alloc_pages_current (0xffffffff812cdca7) Pages: 744 (peak: 744)
|
|
||||||
dracut-pre-pivot[519]: __alloc_pages_nodemask (0xffffffff812b3107) Pages: 744 (peak: 744)
|
|
||||||
dracut-pre-pivot[519]: __alloc_pages_nodemask (0xffffffff812b3107) Pages: 1488 (peak: 1488)
|
|
||||||
dracut-pre-pivot[519]: Top stack usage of module qxl:
|
|
||||||
dracut-pre-pivot[519]: (null) Pages: 865 (peak: 880)
|
|
||||||
dracut-pre-pivot[519]: entry_SYSCALL_64_after_hwframe (0xffffffff81a0008c) Pages: 855 (peak: 858)
|
|
||||||
dracut-pre-pivot[519]: do_syscall_64 (0xffffffff81002a5a) Pages: 855 (peak: 858)
|
|
||||||
dracut-pre-pivot[519]: __x64_sys_finit_module (0xffffffff8117ccea) Pages: 811 (peak: 811)
|
|
||||||
dracut-pre-pivot[519]: __do_sys_finit_module (0xffffffff8117cc6e) Pages: 811 (peak: 811)
|
|
||||||
dracut-pre-pivot[519]: load_module (0xffffffff8117c6be) Pages: 802 (peak: 802)
|
|
||||||
dracut-pre-pivot[519]: do_init_module (0xffffffff81179e72) Pages: 802 (peak: 802)
|
|
||||||
dracut-pre-pivot[519]: do_one_initcall (0xffffffff81000d5a) Pages: 802 (peak: 802)
|
|
||||||
dracut-pre-pivot[519]: serio_raw_poll serio_raw (0xffffffffc0200054) Pages: 802 (peak: 802)
|
|
||||||
dracut-pre-pivot[519]: __pci_register_driver (0xffffffff81557804) Pages: 802 (peak: 802)
|
|
||||||
dracut-pre-pivot[519]: driver_register (0xffffffff8167ed24) Pages: 802 (peak: 802)
|
|
||||||
dracut-pre-pivot[519]: bus_add_driver (0xffffffff8167cbb2) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: driver_attach (0xffffffff8167d28e) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: bus_for_each_dev (0xffffffff8167b62c) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: __driver_attach (0xffffffff8167e18f) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: device_driver_attach (0xffffffff8167e0ed) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: driver_probe_device (0xffffffff8167de6c) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: really_probe (0xffffffff8167d9c9) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: pci_device_probe (0xffffffff81559627) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: local_pci_probe (0xffffffff81557f98) Pages: 801 (peak: 801)
|
|
||||||
dracut-pre-pivot[519]: qxl_pci_probe qxl (0xffffffffc01f0387) Pages: 773 (peak: 773)
|
|
||||||
dracut-pre-pivot[519]: drm_fbdev_generic_setup drm_kms_helper (0xffffffffc01b30c5) Pages: 773 (peak: 773)
|
|
||||||
dracut-pre-pivot[519]: drm_fbdev_client_hotplug drm_kms_helper (0xffffffffc01b2656) Pages: 773 (peak: 773)
|
|
||||||
dracut-pre-pivot[519]: __drm_fb_helper_initial_config_and_unlock drm_kms_helper (0xffffffffc01b1a28) Pages: 770 (peak: 770)
|
|
||||||
dracut-pre-pivot[519]: drm_fb_helper_generic_probe drm_kms_helper (0xffffffffc01b2fa5) Pages: 770 (peak: 770)
|
|
||||||
dracut-pre-pivot[519]: vzalloc (0xffffffff812aa39c) Pages: 770 (peak: 770)
|
|
||||||
dracut-pre-pivot[519]: __vmalloc_node_range (0xffffffff812aa200) Pages: 768 (peak: 768)
|
|
||||||
... snip ...
|
|
||||||
======== Report format module_top END ========
|
|
||||||
|
|
||||||
This could be very helpful for debuging memory usage issues.
|
|
||||||
---
|
|
||||||
dracut.cmdline.7.asc | 16 ++++++++++------
|
|
||||||
dracut.spec | 2 ++
|
|
||||||
modules.d/99base/dracut-lib.sh | 2 +-
|
|
||||||
modules.d/99memstrack/memstrack-report.sh | 23 +++++++++++++++++++++++
|
|
||||||
modules.d/99memstrack/memstrack-start.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
modules.d/99memstrack/memstrack.service | 13 +++++++++++++
|
|
||||||
modules.d/99memstrack/module-setup.sh | 27 +++++++++++++++++++++++++++
|
|
||||||
7 files changed, 144 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
|
|
||||||
index c53601ea..4d4970c8 100644
|
|
||||||
--- a/dracut.cmdline.7.asc
|
|
||||||
+++ b/dracut.cmdline.7.asc
|
|
||||||
@@ -188,8 +188,8 @@ It should be attached to any report about dracut problems.
|
|
||||||
_/run/initramfs/init.log_.
|
|
||||||
If "quiet" is set, it also logs to the console.
|
|
||||||
|
|
||||||
-**rd.memdebug=[0-3]**::
|
|
||||||
- Print memory usage info at various points, set the verbose level from 0 to 4.
|
|
||||||
+**rd.memdebug=[0-5]**::
|
|
||||||
+ Print memory usage info at various points, set the verbose level from 0 to 5.
|
|
||||||
+
|
|
||||||
Higher level means more debugging output:
|
|
||||||
+
|
|
||||||
@@ -198,10 +198,14 @@ It should be attached to any report about dracut problems.
|
|
||||||
1 - partial /proc/meminfo
|
|
||||||
2 - /proc/meminfo
|
|
||||||
3 - /proc/meminfo + /proc/slabinfo
|
|
||||||
- 4 - /proc/meminfo + /proc/slabinfo + tracekomem
|
|
||||||
- NOTE: tracekomem is a shell script utilizing kernel trace to track
|
|
||||||
- the rough total memory consumption of kernel modules during
|
|
||||||
- loading. It may override other trace configurations.
|
|
||||||
+ 4 - /proc/meminfo + /proc/slabinfo + memstrack summary
|
|
||||||
+ NOTE: memstrack is a memory tracing tool that tracks the total memory
|
|
||||||
+ consumption, and peak memory consumption of each kernel modules
|
|
||||||
+ and userspace progress during the whole initramfs runtime, report
|
|
||||||
+ is genereted and the end of initramsfs run.
|
|
||||||
+ 5 - /proc/meminfo + /proc/slabinfo + memstrack (with top memory stacktrace)
|
|
||||||
+ NOTE: memstrack (with top memory stacktrace) will print top memory
|
|
||||||
+ allocation stack traces during the whole initramfs runtime.
|
|
||||||
----
|
|
||||||
|
|
||||||
**rd.break**::
|
|
||||||
diff --git a/dracut.spec b/dracut.spec
|
|
||||||
index 0369dde6..1eb47402 100644
|
|
||||||
--- a/dracut.spec
|
|
||||||
+++ b/dracut.spec
|
|
||||||
@@ -77,6 +77,7 @@ Requires: xz
|
|
||||||
Requires: gzip
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
|
||||||
+Recommends: memstrack
|
|
||||||
Recommends: hardlink
|
|
||||||
Recommends: pigz
|
|
||||||
Recommends: kpartx
|
|
||||||
@@ -403,6 +404,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|
||||||
%{dracutlibdir}/modules.d/98syslog
|
|
||||||
%{dracutlibdir}/modules.d/98usrmount
|
|
||||||
%{dracutlibdir}/modules.d/99base
|
|
||||||
+%{dracutlibdir}/modules.d/99memstrack
|
|
||||||
%{dracutlibdir}/modules.d/99fs-lib
|
|
||||||
%{dracutlibdir}/modules.d/99shutdown
|
|
||||||
%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
|
|
||||||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
|
||||||
index b7020892..e602bacb 100755
|
|
||||||
--- a/modules.d/99base/dracut-lib.sh
|
|
||||||
+++ b/modules.d/99base/dracut-lib.sh
|
|
||||||
@@ -1187,7 +1187,7 @@ are_lists_eq() {
|
|
||||||
|
|
||||||
setmemdebug() {
|
|
||||||
if [ -z "$DEBUG_MEM_LEVEL" ]; then
|
|
||||||
- export DEBUG_MEM_LEVEL=$(getargnum 0 0 3 rd.memdebug)
|
|
||||||
+ export DEBUG_MEM_LEVEL=$(getargnum 0 0 5 rd.memdebug)
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/modules.d/99memstrack/memstrack-report.sh b/modules.d/99memstrack/memstrack-report.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 00000000..241e8621
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/modules.d/99memstrack/memstrack-report.sh
|
|
||||||
@@ -0,0 +1,23 @@
|
|
||||||
+#!/usr/bin/env bash
|
|
||||||
+. /lib/dracut-lib.sh
|
|
||||||
+
|
|
||||||
+if ! [ "$DEBUG_MEM_LEVEL" -ge 4 ]; then
|
|
||||||
+ exit 0
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+if type -P systemctl >/dev/null; then
|
|
||||||
+ systemctl stop memstrack.service
|
|
||||||
+else
|
|
||||||
+ get_pid_of_tracer () {
|
|
||||||
+ local _user _pid _rest
|
|
||||||
+ read _user _pid _rest <<< $(ps aux | grep [m]emstrack | head -1)
|
|
||||||
+ echo $_pid
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ kill -s INT $(get_pid_of_tracer)
|
|
||||||
+ while [[ -n $(get_pid_of_tracer) ]]; do
|
|
||||||
+ sleep 1
|
|
||||||
+ done
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+cat /.memstrack
|
|
||||||
diff --git a/modules.d/99memstrack/memstrack-start.sh b/modules.d/99memstrack/memstrack-start.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 00000000..5aa73efe
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/modules.d/99memstrack/memstrack-start.sh
|
|
||||||
@@ -0,0 +1,68 @@
|
|
||||||
+#!/bin/sh
|
|
||||||
+# Mount kernel debug fs so debug tools can work.
|
|
||||||
+# memdebug=4 and memdebug=5 requires debug fs to be mounted.
|
|
||||||
+# And there is no need to umount it.
|
|
||||||
+
|
|
||||||
+type getargnum >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
|
||||||
+
|
|
||||||
+# "sys/kernel/tracing" has the priority if exists.
|
|
||||||
+get_trace_base() {
|
|
||||||
+ # trace access through debugfs would be obsolete if "/sys/kernel/tracing" is available.
|
|
||||||
+ if [ -d "/sys/kernel/tracing" ]; then
|
|
||||||
+ echo "/sys/kernel"
|
|
||||||
+ else
|
|
||||||
+ echo "/sys/kernel/debug"
|
|
||||||
+ fi
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+is_debugfs_ready() {
|
|
||||||
+ [ -f "$(get_trace_base)/tracing/trace" ]
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+prepare_debugfs() {
|
|
||||||
+ local trace_base
|
|
||||||
+
|
|
||||||
+ trace_base=$(get_trace_base)
|
|
||||||
+ # old debugfs interface case.
|
|
||||||
+ if ! [ -d "$trace_base/tracing" ]; then
|
|
||||||
+ mount none -t debugfs $trace_base
|
|
||||||
+ # new tracefs interface case.
|
|
||||||
+ elif ! [ -f "$trace_base/tracing/trace" ]; then
|
|
||||||
+ mount none -t tracefs "$trace_base/tracing"
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ if ! [ -f "$trace_base/tracing/trace" ]; then
|
|
||||||
+ echo "WARN: failed to mount debugfs"
|
|
||||||
+ return 1
|
|
||||||
+ fi
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+if ! is_debugfs_ready ; then
|
|
||||||
+ prepare_debugfs
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+if [ -n "$DEBUG_MEM_LEVEL" ]; then
|
|
||||||
+ if [ "$DEBUG_MEM_LEVEL" -ge 5 ]; then
|
|
||||||
+ echo "memstrack - will report kernel module memory usage summary and top allocation stack"
|
|
||||||
+ memstrack --report module_summary,module_top --notui --throttle 80 -o /.memstrack &
|
|
||||||
+ elif [ "$DEBUG_MEM_LEVEL" -ge 4 ]; then
|
|
||||||
+ echo "memstrack - will report memory usage summary"
|
|
||||||
+ memstrack --report module_summary --notui --throttle 80 -o /.memstrack &
|
|
||||||
+ else
|
|
||||||
+ exit 0;
|
|
||||||
+ fi
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+PID=$!
|
|
||||||
+RET=$?
|
|
||||||
+
|
|
||||||
+if [ $RET -ne 0 ]; then
|
|
||||||
+ echo "Failed to start memstrack, exit status: $RET"
|
|
||||||
+ exit $RET
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+# Wait a second for memstrack to setup everything, avoid missing any event
|
|
||||||
+sleep 1
|
|
||||||
+
|
|
||||||
+echo $PID > /run/memstrack.pid
|
|
||||||
+disown
|
|
||||||
diff --git a/modules.d/99memstrack/memstrack.service b/modules.d/99memstrack/memstrack.service
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..6b47adef
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/modules.d/99memstrack/memstrack.service
|
|
||||||
@@ -0,0 +1,13 @@
|
|
||||||
+[Unit]
|
|
||||||
+Description=Memstrack Anylazing Service
|
|
||||||
+DefaultDependencies=no
|
|
||||||
+Before=dracut-cmdline.service systemd-udevd.service local-fs-pre.target
|
|
||||||
+IgnoreOnIsolate=true
|
|
||||||
+
|
|
||||||
+[Service]
|
|
||||||
+Type=simple
|
|
||||||
+ExecStart=/bin/memstrack-start
|
|
||||||
+PIDFile=/run/memstrack.pid
|
|
||||||
+StandardInput=null
|
|
||||||
+StandardOutput=syslog+console
|
|
||||||
+StandardError=syslog+console
|
|
||||||
diff --git a/modules.d/99memstrack/module-setup.sh b/modules.d/99memstrack/module-setup.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 00000000..d5bacb4d
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/modules.d/99memstrack/module-setup.sh
|
|
||||||
@@ -0,0 +1,27 @@
|
|
||||||
+#!/usr/bin/bash
|
|
||||||
+
|
|
||||||
+check() {
|
|
||||||
+ if type -P memstrack >/dev/null; then
|
|
||||||
+ dinfo "memstrack is available"
|
|
||||||
+ return 0
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ dinfo "memstrack is not available"
|
|
||||||
+ dinfo "If you need to use rd.memdebug>=4, please install memstrack"
|
|
||||||
+
|
|
||||||
+ return 1
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+depends() {
|
|
||||||
+ return 0
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+install() {
|
|
||||||
+ inst "/bin/memstrack" "/bin/memstrack"
|
|
||||||
+
|
|
||||||
+ inst "$moddir/memstrack-start.sh" "/bin/memstrack-start"
|
|
||||||
+ inst_hook cleanup 99 "$moddir/memstrack-report.sh"
|
|
||||||
+
|
|
||||||
+ inst "$moddir/memstrack.service" "$systemdsystemunitdir/memstrack.service"
|
|
||||||
+ systemctl -q --root "$initdir" add-wants initrd.target memstrack.service
|
|
||||||
+}
|
|
||||||
|
|
29
0044.patch
29
0044.patch
@ -1,29 +0,0 @@
|
|||||||
From faea4e4ddb10f697590b80f8f17181341c537262 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Georg <peter.georg@physik.uni-regensburg.de>
|
|
||||||
Date: Tue, 21 Apr 2020 21:34:38 +0200
|
|
||||||
Subject: [PATCH] Always pull in machinery to read ifcfg files
|
|
||||||
|
|
||||||
So far machinery is only pulled in if the user has not yet included any
|
|
||||||
ifcfg files.
|
|
||||||
---
|
|
||||||
modules.d/35network-manager/module-setup.sh | 6 ++----
|
|
||||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
|
|
||||||
index 8fc3114d..ad2a1534 100755
|
|
||||||
--- a/modules.d/35network-manager/module-setup.sh
|
|
||||||
+++ b/modules.d/35network-manager/module-setup.sh
|
|
||||||
@@ -47,10 +47,8 @@ install() {
|
|
||||||
fi
|
|
||||||
|
|
||||||
# We don't install the ifcfg files from the host automatically.
|
|
||||||
- # But if the user chooses to include them, we pull in the machinery to read them.
|
|
||||||
- if ! [[ -d "$initdir/etc/sysconfig/network-scripts" ]]; then
|
|
||||||
- inst_libdir_file "NetworkManager/$_nm_version/libnm-settings-plugin-ifcfg-rh.so"
|
|
||||||
- fi
|
|
||||||
+ # But the user might choose to include them, so we pull in the machinery to read them.
|
|
||||||
+ inst_libdir_file "NetworkManager/$_nm_version/libnm-settings-plugin-ifcfg-rh.so"
|
|
||||||
|
|
||||||
_arch=${DRACUT_ARCH:-$(uname -m)}
|
|
||||||
|
|
||||||
|
|
66
0045.patch
66
0045.patch
@ -1,66 +0,0 @@
|
|||||||
From 586a56c2877ae8c0b365c3a6c69cd4ff8b27bf0c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Fri, 24 Apr 2020 11:05:49 +0200
|
|
||||||
Subject: [PATCH] Install crypto modules in 90kernel-modules
|
|
||||||
|
|
||||||
We don't want to play catch up with hash and encryption algorithms.
|
|
||||||
To be safe, just use the hammer and include all crypto.
|
|
||||||
|
|
||||||
Fixes https://github.com/dracutdevs/dracut/issues/802
|
|
||||||
---
|
|
||||||
modules.d/90btrfs/module-setup.sh | 2 --
|
|
||||||
modules.d/90crypt/module-setup.sh | 6 +-----
|
|
||||||
modules.d/90kernel-modules/module-setup.sh | 9 +++++++++
|
|
||||||
3 files changed, 10 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
|
|
||||||
index 66a254e1..79f89a50 100755
|
|
||||||
--- a/modules.d/90btrfs/module-setup.sh
|
|
||||||
+++ b/modules.d/90btrfs/module-setup.sh
|
|
||||||
@@ -26,8 +26,6 @@ depends() {
|
|
||||||
# called by dracut
|
|
||||||
installkernel() {
|
|
||||||
instmods btrfs
|
|
||||||
- # Make sure btfs can use fast crc32c implementations where available (bsc#1011554)
|
|
||||||
- instmods crc32c-intel
|
|
||||||
}
|
|
||||||
|
|
||||||
# called by dracut
|
|
||||||
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
|
|
||||||
index 3ee4c545..a9dda734 100755
|
|
||||||
--- a/modules.d/90crypt/module-setup.sh
|
|
||||||
+++ b/modules.d/90crypt/module-setup.sh
|
|
||||||
@@ -25,11 +25,7 @@ depends() {
|
|
||||||
# called by dracut
|
|
||||||
installkernel() {
|
|
||||||
hostonly="" instmods drbg
|
|
||||||
- arch=$(uname -m)
|
|
||||||
- [[ $arch == x86_64 ]] && arch=x86
|
|
||||||
- [[ $arch == s390x ]] && arch=s390
|
|
||||||
- [[ $arch == aarch64 ]] && arch=arm64
|
|
||||||
- instmods dm_crypt =crypto =drivers/crypto =arch/$arch/crypto
|
|
||||||
+ instmods dm_crypt
|
|
||||||
}
|
|
||||||
|
|
||||||
# called by dracut
|
|
||||||
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
index bc3810cc..28d291eb 100755
|
|
||||||
--- a/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
+++ b/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
@@ -104,6 +104,15 @@ installkernel() {
|
|
||||||
elif [[ "${host_fs_types[*]}" ]]; then
|
|
||||||
hostonly='' instmods "${host_fs_types[@]}"
|
|
||||||
fi
|
|
||||||
+
|
|
||||||
+ arch=${DRACUT_ARCH:-$(uname -m)}
|
|
||||||
+
|
|
||||||
+ # We don't want to play catch up with hash and encryption algorithms.
|
|
||||||
+ # To be safe, just use the hammer and include all crypto.
|
|
||||||
+ [[ $arch == x86_64 ]] && arch=x86
|
|
||||||
+ [[ $arch == s390x ]] && arch=s390
|
|
||||||
+ [[ $arch == aarch64 ]] && arch=arm64
|
|
||||||
+ instmods "=crypto" "=arch/$arch/crypto" "=drivers/crypto"
|
|
||||||
fi
|
|
||||||
:
|
|
||||||
}
|
|
||||||
|
|
53
0046.patch
53
0046.patch
@ -1,53 +0,0 @@
|
|||||||
From 5bfebf0f04c8e88a0447d5f75c7ec13951fa610d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Tue, 7 Apr 2020 22:26:25 +0200
|
|
||||||
Subject: [PATCH] 90crypt/module-setup.sh: try to catch kernel config changes
|
|
||||||
|
|
||||||
If a crypto kernel module changes from compiled in to module, the
|
|
||||||
encrypted disk might fail to open, because the kernel module was
|
|
||||||
not included in the initramfs.
|
|
||||||
|
|
||||||
This patch tries heuristically to catch such modules.
|
|
||||||
|
|
||||||
Fixes https://github.com/dracutdevs/dracut/issues/706
|
|
||||||
---
|
|
||||||
modules.d/90crypt/module-setup.sh | 25 +++++++++++++++++++++++++
|
|
||||||
1 file changed, 25 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
|
|
||||||
index a9dda734..3bce2411 100755
|
|
||||||
--- a/modules.d/90crypt/module-setup.sh
|
|
||||||
+++ b/modules.d/90crypt/module-setup.sh
|
|
||||||
@@ -26,6 +26,31 @@ depends() {
|
|
||||||
installkernel() {
|
|
||||||
hostonly="" instmods drbg
|
|
||||||
instmods dm_crypt
|
|
||||||
+
|
|
||||||
+ # in case some of the crypto modules moved from compiled in
|
|
||||||
+ # to module based, try to install those modules
|
|
||||||
+ # best guess
|
|
||||||
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
||||||
+ # dmsetup returns s.th. like
|
|
||||||
+ # cryptvol: 0 2064384 crypt aes-xts-plain64 :64:logon:cryptsetup:....
|
|
||||||
+ dmsetup table | while read name _ _ is_crypt cipher _; do
|
|
||||||
+ [[ $is_crypt != "crypt" ]] && continue
|
|
||||||
+ # get the device name
|
|
||||||
+ name=/dev/$(dmsetup info -c --noheadings -o blkdevname ${name%:})
|
|
||||||
+ # check if the device exists as a key in our host_fs_types
|
|
||||||
+ if [[ ${host_fs_types[$name]+_} ]]; then
|
|
||||||
+ # split the cipher aes-xts-plain64 in pieces
|
|
||||||
+ _OLD_IFS=$IFS
|
|
||||||
+ IFS='-:'
|
|
||||||
+ set -- $cipher
|
|
||||||
+ IFS=$_OLD_IFS
|
|
||||||
+ # try to load the cipher part with "crypto-" prepended
|
|
||||||
+ # in non-hostonly mode
|
|
||||||
+ hostonly= instmods $(for k in "$@"; do echo "crypto-$k";done)
|
|
||||||
+ fi
|
|
||||||
+ done
|
|
||||||
+ }
|
|
||||||
+ return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# called by dracut
|
|
||||||
|
|
24
0047.patch
24
0047.patch
@ -1,24 +0,0 @@
|
|||||||
From c6a2ebffe5812bf45a17d90208d9bb1044b6dba0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Thu, 30 Apr 2020 20:42:27 +0200
|
|
||||||
Subject: [PATCH] 90kernel-modules/module-setup.sh: add sg kernel module
|
|
||||||
|
|
||||||
Fixes udevd messages about failure of `modprobe -bv sg`.
|
|
||||||
---
|
|
||||||
modules.d/90kernel-modules/module-setup.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
index 28d291eb..b3aa75f3 100755
|
|
||||||
--- a/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
+++ b/modules.d/90kernel-modules/module-setup.sh
|
|
||||||
@@ -25,7 +25,7 @@ installkernel() {
|
|
||||||
}
|
|
||||||
|
|
||||||
install_block_modules () {
|
|
||||||
- hostonly='' instmods sr_mod sd_mod scsi_dh ata_piix
|
|
||||||
+ hostonly='' instmods sg sr_mod sd_mod scsi_dh ata_piix
|
|
||||||
instmods \
|
|
||||||
scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
|
|
||||||
=ide nvme vmd \
|
|
||||||
|
|
26
0048.patch
26
0048.patch
@ -1,26 +0,0 @@
|
|||||||
From cb9e6881dde7ec34e11f6f38727602d6d841a04f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Derek Hageman <hageman@inthat.cloud>
|
|
||||||
Date: Thu, 30 Apr 2020 18:40:13 -0600
|
|
||||||
Subject: [PATCH] 90crypt/module-setup.sh: fix force on multiple lines
|
|
||||||
|
|
||||||
The first line in crypttab with a "force" option causes all subsequent
|
|
||||||
lines to be included as if they also had it set because the variable
|
|
||||||
used to track it is not reset between loop iterations. So fix that by
|
|
||||||
just setting it to empty before the check for the force option.
|
|
||||||
---
|
|
||||||
modules.d/90crypt/module-setup.sh | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
|
|
||||||
index 3bce2411..e3d6338f 100755
|
|
||||||
--- a/modules.d/90crypt/module-setup.sh
|
|
||||||
+++ b/modules.d/90crypt/module-setup.sh
|
|
||||||
@@ -113,6 +113,7 @@ install() {
|
|
||||||
set -- ${luksoptions}
|
|
||||||
IFS="${OLD_IFS}"
|
|
||||||
|
|
||||||
+ forceentry=""
|
|
||||||
while [ $# -gt 0 ]; do
|
|
||||||
case $1 in
|
|
||||||
force)
|
|
||||||
|
|
25
0049.patch
25
0049.patch
@ -1,25 +0,0 @@
|
|||||||
From 32dfd41688a0a2aee59a62dd661c808a935d91a4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabian Vogt <fvogt@suse.de>
|
|
||||||
Date: Mon, 4 May 2020 10:09:07 +0200
|
|
||||||
Subject: [PATCH] Fix test in lsinitrd
|
|
||||||
|
|
||||||
If $uefi is empty, this evaluated to true previously,
|
|
||||||
resulting in "initrd in UEFI: : 13M".
|
|
||||||
---
|
|
||||||
lsinitrd.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lsinitrd.sh b/lsinitrd.sh
|
|
||||||
index b5c73f62..ea0c7f62 100755
|
|
||||||
--- a/lsinitrd.sh
|
|
||||||
+++ b/lsinitrd.sh
|
|
||||||
@@ -206,7 +206,7 @@ if [ "$bin" = "MZ" ]; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
if (( ${#filenames[@]} <= 0 )) && [[ -z "$unpack" ]] && [[ -z "$unpackearly" ]]; then
|
|
||||||
- if [ -n $uefi ]; then
|
|
||||||
+ if [ -n "$uefi" ]; then
|
|
||||||
echo -n "initrd in UEFI: $uefi: "
|
|
||||||
du -h $image | while read a b || [ -n "$a" ]; do echo $a;done
|
|
||||||
if [ -f "$TMPDIR/osrel.txt" ]; then
|
|
||||||
|
|
43
0050.patch
43
0050.patch
@ -1,43 +0,0 @@
|
|||||||
From ff366790a6e30175f243d54c2922a8c781030ede Mon Sep 17 00:00:00 2001
|
|
||||||
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
||||||
Date: Tue, 5 May 2020 19:11:18 +0200
|
|
||||||
Subject: [PATCH] 51-dracut-rescue.install: Don't use BLS fragment shipped by
|
|
||||||
kernel package
|
|
||||||
|
|
||||||
For the GRUB and zipl bootloaders the BLS fragment that is shipped by the
|
|
||||||
kernel package is used, so the same fragment is used for the rescue entry.
|
|
||||||
|
|
||||||
But there are cases where this BLS fragment is not suitable. For example,
|
|
||||||
if the boot directory is on a btrfs subvolume the path in the linux and
|
|
||||||
initrd fiels need to be adjusted with the real path. Otherwise GRUB won't
|
|
||||||
be able to read them.
|
|
||||||
|
|
||||||
The GRUB and zipl kernel-install plugins already take care of this before
|
|
||||||
installing the BLS fragments, so just copy the installed fragment that has
|
|
||||||
the updated paths instead of using the BLS shipped by the kernel package.
|
|
||||||
|
|
||||||
Resolves: rhbz#1827882
|
|
||||||
|
|
||||||
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
||||||
---
|
|
||||||
51-dracut-rescue.install | 6 +++++-
|
|
||||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/51-dracut-rescue.install b/51-dracut-rescue.install
|
|
||||||
index b4ed1783..b2b3b9ef 100755
|
|
||||||
--- a/51-dracut-rescue.install
|
|
||||||
+++ b/51-dracut-rescue.install
|
|
||||||
@@ -106,7 +106,11 @@ case "$COMMAND" in
|
|
||||||
echo "initrd $BOOT_DIR/initrd"
|
|
||||||
} > $LOADER_ENTRY
|
|
||||||
else
|
|
||||||
- cp -aT "${KERNEL_IMAGE%/*}/bls.conf" $LOADER_ENTRY
|
|
||||||
+ if [[ -e "${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf" ]]; then
|
|
||||||
+ cp -aT "${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf" $LOADER_ENTRY
|
|
||||||
+ else
|
|
||||||
+ cp -aT "${KERNEL_IMAGE%/*}/bls.conf" $LOADER_ENTRY
|
|
||||||
+ fi
|
|
||||||
sed -i 's/'$KERNEL_VERSION'/0-rescue-'${MACHINE_ID}'/' $LOADER_ENTRY
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
25
0051.patch
25
0051.patch
@ -1,25 +0,0 @@
|
|||||||
From 1ec7b694b55c70d06f262a96c320709b70d20bcb Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Tomasz=20Pawe=C5=82=20Gajc?= <tpgxyz@gmail.com>
|
|
||||||
Date: Mon, 11 May 2020 14:49:06 +0200
|
|
||||||
Subject: [PATCH] install dependant libs too
|
|
||||||
|
|
||||||
By default rng-tools are compiled with pkcs11 support.
|
|
||||||
Make sure opensc-pkcs11.so library is installed inside initramfs to prevent error on boot
|
|
||||||
---
|
|
||||||
modules.d/06rngd/module-setup.sh | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh
|
|
||||||
index 354bd0bb..f07a0cb9 100644
|
|
||||||
--- a/modules.d/06rngd/module-setup.sh
|
|
||||||
+++ b/modules.d/06rngd/module-setup.sh
|
|
||||||
@@ -33,6 +33,8 @@ check() {
|
|
||||||
install() {
|
|
||||||
inst rngd
|
|
||||||
inst_simple "${moddir}/rngd.service" "${systemdsystemunitdir}/rngd.service"
|
|
||||||
+ # make sure dependant libs are installed too
|
|
||||||
+ inst_libdir_file opensc-pkcs11.so
|
|
||||||
|
|
||||||
systemctl -q --root "$initdir" add-wants sysinit.target rngd.service
|
|
||||||
}
|
|
||||||
|
|
34
0052.patch
34
0052.patch
@ -1,34 +0,0 @@
|
|||||||
From 424f01e2a0ac0b329e68eb63048cf0d6d9c74d37 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kairui Song <kasong@redhat.com>
|
|
||||||
Date: Wed, 27 May 2020 22:07:37 +0800
|
|
||||||
Subject: [PATCH] 99memstrack: hook script should not call exit
|
|
||||||
|
|
||||||
With memstrack module, rd.break may not work because the hook scripts
|
|
||||||
are sourced, not executed, so the exit call will make pre-pivot queue
|
|
||||||
exit early. See 98dracut-systemd/dracut-pre-pivot.sh, everything after
|
|
||||||
"source_hook cleanup" will be ignored.
|
|
||||||
|
|
||||||
Replace with return instead.
|
|
||||||
|
|
||||||
Credits go to Lukas Nykryn <lnykryn@redhat.com> who helped discover and
|
|
||||||
debug this issue.
|
|
||||||
|
|
||||||
Signed-off-by: Kairui Song <kasong@redhat.com>
|
|
||||||
---
|
|
||||||
modules.d/99memstrack/memstrack-report.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/99memstrack/memstrack-report.sh b/modules.d/99memstrack/memstrack-report.sh
|
|
||||||
index 241e8621..3de55bd1 100755
|
|
||||||
--- a/modules.d/99memstrack/memstrack-report.sh
|
|
||||||
+++ b/modules.d/99memstrack/memstrack-report.sh
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
. /lib/dracut-lib.sh
|
|
||||||
|
|
||||||
if ! [ "$DEBUG_MEM_LEVEL" -ge 4 ]; then
|
|
||||||
- exit 0
|
|
||||||
+ return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if type -P systemctl >/dev/null; then
|
|
||||||
|
|
39
0053.patch
39
0053.patch
@ -1,39 +0,0 @@
|
|||||||
From 2a611328652388b809a379403ceec126cb55819f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kairui Song <kasong@redhat.com>
|
|
||||||
Date: Wed, 27 May 2020 21:59:55 +0800
|
|
||||||
Subject: [PATCH] Remove cleanup_trace_mem calls
|
|
||||||
|
|
||||||
In commit 49c4172 all shell based memory tracing functions are removed,
|
|
||||||
there are some left over. Remove them as well.
|
|
||||||
|
|
||||||
Signed-off-by: Kairui Song <kasong@redhat.com>
|
|
||||||
---
|
|
||||||
modules.d/98dracut-systemd/dracut-pre-pivot.sh | 1 -
|
|
||||||
modules.d/99base/init.sh | 1 -
|
|
||||||
2 files changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.sh b/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
||||||
index 96e6f8ca..cc70e3c3 100755
|
|
||||||
--- a/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
||||||
+++ b/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
||||||
@@ -14,7 +14,6 @@ make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab'
|
|
||||||
getarg 'rd.break=pre-pivot' 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break pre-pivot"
|
|
||||||
source_hook pre-pivot
|
|
||||||
|
|
||||||
-cleanup_trace_mem
|
|
||||||
# pre pivot cleanup scripts are sourced just before we switch over to the new root.
|
|
||||||
getarg 'rd.break=cleanup' 'rdbreak=cleanup' && emergency_shell -n cleanup "Break cleanup"
|
|
||||||
source_hook cleanup
|
|
||||||
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
|
|
||||||
index 148ce831..f70a811e 100755
|
|
||||||
--- a/modules.d/99base/init.sh
|
|
||||||
+++ b/modules.d/99base/init.sh
|
|
||||||
@@ -271,7 +271,6 @@ getarg 'rd.break=pre-pivot' -d 'rdbreak=pre-pivot' && emergency_shell -n pre-piv
|
|
||||||
source_hook pre-pivot
|
|
||||||
|
|
||||||
make_trace_mem "hook cleanup" '1:shortmem' '2+:mem' '3+:slab'
|
|
||||||
-cleanup_trace_mem
|
|
||||||
# pre pivot cleanup scripts are sourced just before we switch over to the new root.
|
|
||||||
getarg 'rd.break=cleanup' -d 'rdbreak=cleanup' && emergency_shell -n cleanup "Break cleanup"
|
|
||||||
source_hook cleanup
|
|
||||||
|
|
60
0054.patch
60
0054.patch
@ -1,60 +0,0 @@
|
|||||||
From f769154bccf22d2b5caf5e4888f88bf7edde2662 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Tsoy <alexander@tsoy.me>
|
|
||||||
Date: Mon, 25 May 2020 19:02:05 +0300
|
|
||||||
Subject: [PATCH] dracut-functions: fix find_binary() to return full path
|
|
||||||
|
|
||||||
Fixes: a01204202b30 (Allow running on a cross-compiled rootfs)
|
|
||||||
---
|
|
||||||
dracut-functions.sh | 21 +++++++++++++--------
|
|
||||||
1 file changed, 13 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
|
||||||
index 3cb9c7af..b5c28248 100755
|
|
||||||
--- a/dracut-functions.sh
|
|
||||||
+++ b/dracut-functions.sh
|
|
||||||
@@ -41,31 +41,36 @@ str_ends() { [ "${1%*"$2"}" != "$1" ]; }
|
|
||||||
# search in the usual places to find the binary.
|
|
||||||
find_binary() {
|
|
||||||
local _delim
|
|
||||||
+ local _path
|
|
||||||
local l
|
|
||||||
local p
|
|
||||||
[[ -z ${1##/*} ]] || _delim="/"
|
|
||||||
|
|
||||||
if [[ "$1" == *.so* ]]; then
|
|
||||||
for l in libdirs ; do
|
|
||||||
- if { $DRACUT_LDD "$dracutsysrootdir$l$_delim$1" &>/dev/null; }; then
|
|
||||||
- printf "%s\n" "$1"
|
|
||||||
+ _path="${l}${_delim}${1}"
|
|
||||||
+ if { $DRACUT_LDD "${dracutsysrootdir}${_path}" &>/dev/null; }; then
|
|
||||||
+ printf "%s\n" "${_path}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
- if { $DRACUT_LDD "$dracutsysrootdir$_delim$1" &>/dev/null; }; then
|
|
||||||
- printf "%s\n" "$1"
|
|
||||||
+ _path="${_delim}${1}"
|
|
||||||
+ if { $DRACUT_LDD "${dracutsysrootdir}${_path}" &>/dev/null; }; then
|
|
||||||
+ printf "%s\n" "${_path}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [[ "$1" == */* ]]; then
|
|
||||||
- if [[ -L $dracutsysrootdir$_delim$1 ]] || [[ -x $dracutsysrootdir$_delim$1 ]]; then
|
|
||||||
- printf "%s\n" "$1"
|
|
||||||
+ _path="${_delim}${1}"
|
|
||||||
+ if [[ -L ${dracutsysrootdir}${_path} ]] || [[ -x ${dracutsysrootdir}${_path} ]]; then
|
|
||||||
+ printf "%s\n" "${_path}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
for p in $DRACUT_PATH ; do
|
|
||||||
- if [[ -L $dracutsysrootdir$p$_delim$1 ]] || [[ -x $dracutsysrootdir$p$_delim$1 ]]; then
|
|
||||||
- printf "%s\n" "$1"
|
|
||||||
+ _path="${p}${_delim}${1}"
|
|
||||||
+ if [[ -L ${dracutsysrootdir}${_path} ]] || [[ -x ${dracutsysrootdir}${_path} ]]; then
|
|
||||||
+ printf "%s\n" "${_path}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
38
0055.patch
38
0055.patch
@ -1,38 +0,0 @@
|
|||||||
From 50cc23ba32b0fda63eff7623b529dbeb4e6a38c6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Tsoy <alexander@tsoy.me>
|
|
||||||
Date: Mon, 25 May 2020 17:49:20 +0300
|
|
||||||
Subject: [PATCH] busybox: simplify listing of supported utilities
|
|
||||||
|
|
||||||
'--list' option is supported since busybox-1.20.0, which was released
|
|
||||||
in 2010.
|
|
||||||
---
|
|
||||||
modules.d/05busybox/module-setup.sh | 11 ++++++-----
|
|
||||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/05busybox/module-setup.sh b/modules.d/05busybox/module-setup.sh
|
|
||||||
index ecbd6a13..5d88c5d1 100755
|
|
||||||
--- a/modules.d/05busybox/module-setup.sh
|
|
||||||
+++ b/modules.d/05busybox/module-setup.sh
|
|
||||||
@@ -14,15 +14,16 @@ depends() {
|
|
||||||
|
|
||||||
# called by dracut
|
|
||||||
install() {
|
|
||||||
- local _i _progs _path _busybox
|
|
||||||
+ local _i _path _busybox
|
|
||||||
+ local _progs=()
|
|
||||||
_busybox=$(type -P busybox)
|
|
||||||
inst $_busybox /usr/bin/busybox
|
|
||||||
- for _i in $($_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}')
|
|
||||||
- do
|
|
||||||
- _progs="$_progs $_i"
|
|
||||||
+ for _i in $($_busybox --list); do
|
|
||||||
+ [[ ${_i} == busybox ]] && continue
|
|
||||||
+ _progs+=("${_i}")
|
|
||||||
done
|
|
||||||
|
|
||||||
- for _i in $_progs; do
|
|
||||||
+ for _i in "${_progs[@]}"; do
|
|
||||||
_path=$(find_binary "$_i")
|
|
||||||
[ -z "$_path" ] && continue
|
|
||||||
ln_r /usr/bin/busybox $_path
|
|
||||||
|
|
52
0056.patch
52
0056.patch
@ -1,52 +0,0 @@
|
|||||||
From b448655ba7cf46d25cbc2845e30ec559a487fc1e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Fri, 29 May 2020 10:30:26 +0200
|
|
||||||
Subject: [PATCH] CI: remove Fedora 30, add Fedora 32
|
|
||||||
|
|
||||||
---
|
|
||||||
.github/workflows/{fedora-30.yml => fedora-32.yml} | 10 ++++++++--
|
|
||||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/fedora-30.yml b/.github/workflows/fedora-32.yml
|
|
||||||
similarity index 84%
|
|
||||||
rename from .github/workflows/fedora-30.yml
|
|
||||||
rename to .github/workflows/fedora-32.yml
|
|
||||||
index 1a3d3e8d..589bf176 100644
|
|
||||||
--- a/.github/workflows/fedora-30.yml
|
|
||||||
+++ b/.github/workflows/fedora-32.yml
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
## The test container is created with https://github.com/dracutdevs/fedora-container
|
|
||||||
|
|
||||||
-name: Fedora-30
|
|
||||||
+name: Fedora-32
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
@@ -14,7 +14,7 @@ jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container:
|
|
||||||
- image: quay.io/haraldh/dracut-fedora:30
|
|
||||||
+ image: quay.io/haraldh/dracut-fedora:32
|
|
||||||
options: "--privileged"
|
|
||||||
timeout-minutes: 45
|
|
||||||
strategy:
|
|
||||||
@@ -32,11 +32,17 @@ jobs:
|
|
||||||
"15",
|
|
||||||
"17",
|
|
||||||
"20",
|
|
||||||
+ "21",
|
|
||||||
"30",
|
|
||||||
+ "31",
|
|
||||||
"35",
|
|
||||||
+ "36",
|
|
||||||
"40",
|
|
||||||
+ "41",
|
|
||||||
"50",
|
|
||||||
+ "51",
|
|
||||||
"60",
|
|
||||||
+ "61",
|
|
||||||
"99",
|
|
||||||
]
|
|
||||||
fail-fast: false
|
|
||||||
|
|
34
0057.patch
34
0057.patch
@ -1,34 +0,0 @@
|
|||||||
From c800d1a7b943f8ca86b9756fbaa4cd2a5644ad44 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Fri, 29 May 2020 10:49:47 +0200
|
|
||||||
Subject: [PATCH] dracut.cmdline.7.asc: clarify usage of `rd.lvm.vg` and
|
|
||||||
`rd.lvm.lv`
|
|
||||||
|
|
||||||
Fixes: https://github.com/dracutdevs/dracut/issues/816
|
|
||||||
---
|
|
||||||
dracut.cmdline.7.asc | 10 +++++-----
|
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
|
|
||||||
index 4d4970c8..751f5276 100644
|
|
||||||
--- a/dracut.cmdline.7.asc
|
|
||||||
+++ b/dracut.cmdline.7.asc
|
|
||||||
@@ -281,12 +281,12 @@ LVM
|
|
||||||
disable LVM detection
|
|
||||||
|
|
||||||
**rd.lvm.vg=**__<volume group name>__::
|
|
||||||
- only activate the volume groups with the given name. rd.lvm.vg can be
|
|
||||||
- specified multiple times on the kernel command line.
|
|
||||||
+ only activate all logical volumes in the the volume groups with the given name.
|
|
||||||
+ rd.lvm.vg can be specified multiple times on the kernel command line.
|
|
||||||
|
|
||||||
-**rd.lvm.lv=**__<logical volume name>__::
|
|
||||||
- only activate the logical volumes with the given name. rd.lvm.lv can be
|
|
||||||
- specified multiple times on the kernel command line.
|
|
||||||
+**rd.lvm.lv=**__<volume group name>/<logical volume name>__::
|
|
||||||
+ only activate the logical volumes with the given name.
|
|
||||||
+ rd.lvm.lv can be specified multiple times on the kernel command line.
|
|
||||||
|
|
||||||
**rd.lvm.conf=0**::
|
|
||||||
remove any _/etc/lvm/lvm.conf_, which may exist in the initramfs
|
|
||||||
|
|
31
0058.patch
31
0058.patch
@ -1,31 +0,0 @@
|
|||||||
From 7169e5f0e43cdc9a0bdc93de33f3404d8c461acd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Fri, 29 May 2020 11:03:19 +0200
|
|
||||||
Subject: [PATCH] dracut.conf.5.asc: document how to config --no-compress in
|
|
||||||
the config
|
|
||||||
|
|
||||||
Fixes: https://github.com/dracutdevs/dracut/issues/824
|
|
||||||
---
|
|
||||||
dracut.conf.5.asc | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
|
|
||||||
index 937f5423..f206f2f7 100644
|
|
||||||
--- a/dracut.conf.5.asc
|
|
||||||
+++ b/dracut.conf.5.asc
|
|
||||||
@@ -80,12 +80,13 @@ Configuration files must have the extension .conf; other extensions are ignored.
|
|
||||||
Specify additional files to include in the initramfs, separated by spaces,
|
|
||||||
if they exist.
|
|
||||||
|
|
||||||
-*compress=*"__{bzip2|lzma|xz|gzip|lzo|lz4|zstd|<compressor [args ...]>}__"::
|
|
||||||
+*compress=*"__{cat|bzip2|lzma|xz|gzip|lzo|lz4|zstd|<compressor [args ...]>}__"::
|
|
||||||
Compress the generated initramfs using the passed compression program. If
|
|
||||||
you pass it just the name of a compression program, it will call that
|
|
||||||
program with known-working arguments. If you pass arguments, it will be called
|
|
||||||
with exactly those arguments. Depending on what you pass, this may result in
|
|
||||||
an initramfs that the kernel cannot decompress.
|
|
||||||
+ To disable compression, use "cat".
|
|
||||||
|
|
||||||
*do_strip=*"__{yes|no}__"::
|
|
||||||
Strip binaries in the initramfs (default=yes)
|
|
||||||
|
|
38
0059.patch
38
0059.patch
@ -1,38 +0,0 @@
|
|||||||
From eb770a4a207b2e9e3080068c1df22b69ed44d4b5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
||||||
Date: Thu, 7 May 2020 07:48:12 +0200
|
|
||||||
Subject: [PATCH] network-manager: set kernel hostname from the command line
|
|
||||||
|
|
||||||
Since commit ff70adf873ef ("initrd: save hostname to a file in /run"),
|
|
||||||
the initrd generator of NetworkManager parses the hostname from 'ip='
|
|
||||||
options of the kernel command line and writes it to
|
|
||||||
/run/NetworkManager/initrd/hostname.
|
|
||||||
|
|
||||||
When that file exists, set the kernel hostname.
|
|
||||||
|
|
||||||
In presence of multiple hostnames in the command line, the last one
|
|
||||||
wins. Hostnames from command line always have precedence over ones
|
|
||||||
received through DHCP. This is a bit different from the legacy network
|
|
||||||
module that gives higher precedence to the hostname (from DHCP or
|
|
||||||
command line) of the last interface that is brought up, which depends
|
|
||||||
on the udev order.
|
|
||||||
---
|
|
||||||
modules.d/35network-manager/nm-run.sh | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
|
|
||||||
index fc5280a1..61752384 100755
|
|
||||||
--- a/modules.d/35network-manager/nm-run.sh
|
|
||||||
+++ b/modules.d/35network-manager/nm-run.sh
|
|
||||||
@@ -10,6 +10,10 @@ for i in /usr/lib/NetworkManager/system-connections/* \
|
|
||||||
else
|
|
||||||
/usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
|
|
||||||
fi
|
|
||||||
+
|
|
||||||
+ if [ -s /run/NetworkManager/initrd/hostname ]; then
|
|
||||||
+ cat /run/NetworkManager/initrd/hostname > /proc/sys/kernel/hostname
|
|
||||||
+ fi
|
|
||||||
break
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
59
0060.patch
59
0060.patch
@ -1,59 +0,0 @@
|
|||||||
From 871d63c3be529cee2c2bd868750eda121ece46dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Hoyer <harald@redhat.com>
|
|
||||||
Date: Fri, 29 May 2020 14:43:57 +0200
|
|
||||||
Subject: [PATCH] Fix CI badges in README.md and fix dracut description
|
|
||||||
|
|
||||||
While fixing the CI badges, I removed some old crufty README text.
|
|
||||||
---
|
|
||||||
README.md | 11 ++++-------
|
|
||||||
dracut.spec | 2 +-
|
|
||||||
2 files changed, 5 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/README.md b/README.md
|
|
||||||
index 9948bf97..0ab54ea6 100644
|
|
||||||
--- a/README.md
|
|
||||||
+++ b/README.md
|
|
||||||
@@ -4,15 +4,15 @@ dracut
|
|
||||||
dracut is an event driven initramfs infrastructure.
|
|
||||||
|
|
||||||
[![Build Status](https://travis-ci.org/dracutdevs/dracut.svg?branch=master)](https://travis-ci.org/dracutdevs/dracut)
|
|
||||||
-[![Fedora-30](https://github.com/dracutdevs/dracut/workflows/Fedora-30/badge.svg?branch=master)](https://github.com/dracutdevs/dracut/actions?query=workflow%3AFedora-30)
|
|
||||||
[![Fedora-31](https://github.com/dracutdevs/dracut/workflows/Fedora-31/badge.svg?branch=master)](https://github.com/dracutdevs/dracut/actions?query=workflow%3AFedora-31)
|
|
||||||
+[![Fedora-32](https://github.com/dracutdevs/dracut/workflows/Fedora-32/badge.svg?branch=master)](https://github.com/dracutdevs/dracut/actions?query=workflow%3AFedora-32)
|
|
||||||
|
|
||||||
dracut (the tool) is used to create an initramfs image by copying tools
|
|
||||||
and files from an installed system and combining it with the
|
|
||||||
dracut framework, usually found in /usr/lib/dracut/modules.d.
|
|
||||||
|
|
||||||
-Unlike existing initramfs's, this is an attempt at having as little as
|
|
||||||
-possible hard-coded into the initramfs as possible. The initramfs has
|
|
||||||
+Unlike other implementations, dracut hard-codes as little
|
|
||||||
+as possible into the initramfs. The initramfs has
|
|
||||||
(basically) one purpose in life -- getting the rootfs mounted so that
|
|
||||||
we can transition to the real rootfs. This is all driven off of
|
|
||||||
device availability. Therefore, instead of scripts hard-coded to do
|
|
||||||
@@ -20,10 +20,7 @@ various things, we depend on udev to create device nodes for us and
|
|
||||||
then when we have the rootfs's device node, we mount and carry on.
|
|
||||||
This helps to keep the time required in the initramfs as little as
|
|
||||||
possible so that things like a 5 second boot aren't made impossible as
|
|
||||||
-a result of the very existence of an initramfs. It's likely that
|
|
||||||
-we'll grow some hooks for running arbitrary commands in the flow of
|
|
||||||
-the script, but it's worth trying to resist the urge as much as we can
|
|
||||||
-as hooks are guaranteed to be the path to slow-down.
|
|
||||||
+a result of the very existence of an initramfs.
|
|
||||||
|
|
||||||
Most of the initramfs generation functionality in dracut is provided by a bunch
|
|
||||||
of generator modules that are sourced by the main dracut script to install
|
|
||||||
diff --git a/dracut.spec b/dracut.spec
|
|
||||||
index 1eb47402..4d1cb7a4 100644
|
|
||||||
--- a/dracut.spec
|
|
||||||
+++ b/dracut.spec
|
|
||||||
@@ -99,7 +99,7 @@ Requires: libkcapi-hmaccalc
|
|
||||||
|
|
||||||
%description
|
|
||||||
dracut contains tools to create bootable initramfses for the Linux
|
|
||||||
-kernel. Unlike previous implementations, dracut hard-codes as little
|
|
||||||
+kernel. Unlike other implementations, dracut hard-codes as little
|
|
||||||
as possible into the initramfs. dracut contains various modules which
|
|
||||||
are driven by the event-based udev. Having root on MD, DM, LVM2, LUKS
|
|
||||||
is supported as well as NFS, iSCSI, NBD, FCoE with the dracut-network
|
|
166
dracut.spec
166
dracut.spec
@ -5,10 +5,10 @@
|
|||||||
# strip the automatically generated dep here and instead co-own the
|
# strip the automatically generated dep here and instead co-own the
|
||||||
# directory.
|
# directory.
|
||||||
%global __requires_exclude pkg-config
|
%global __requires_exclude pkg-config
|
||||||
%define dist_free_release 64.git20200529
|
%define dist_free_release 5.git20210517
|
||||||
|
|
||||||
Name: dracut
|
Name: dracut
|
||||||
Version: 050
|
Version: 054
|
||||||
Release: %{dist_free_release}%{?dist}
|
Release: %{dist_free_release}%{?dist}
|
||||||
|
|
||||||
Summary: Initramfs generator using udev
|
Summary: Initramfs generator using udev
|
||||||
@ -21,7 +21,8 @@ Group: System/Base
|
|||||||
|
|
||||||
# The entire source code is GPLv2+
|
# The entire source code is GPLv2+
|
||||||
# except install/* which is LGPLv2+
|
# except install/* which is LGPLv2+
|
||||||
License: GPLv2+ and LGPLv2+
|
# except util/* which is GPLv2
|
||||||
|
License: GPLv2+ and LGPLv2+ and GPLv2
|
||||||
|
|
||||||
URL: https://dracut.wiki.kernel.org/
|
URL: https://dracut.wiki.kernel.org/
|
||||||
|
|
||||||
@ -32,76 +33,11 @@ Patch1: 0001.patch
|
|||||||
Patch2: 0002.patch
|
Patch2: 0002.patch
|
||||||
Patch3: 0003.patch
|
Patch3: 0003.patch
|
||||||
Patch4: 0004.patch
|
Patch4: 0004.patch
|
||||||
Patch5: 0005.patch
|
|
||||||
Patch6: 0006.patch
|
|
||||||
Patch7: 0007.patch
|
|
||||||
Patch8: 0008.patch
|
|
||||||
Patch9: 0009.patch
|
|
||||||
Patch10: 0010.patch
|
|
||||||
Patch11: 0011.patch
|
|
||||||
Patch12: 0012.patch
|
|
||||||
Patch13: 0013.patch
|
|
||||||
Patch14: 0014.patch
|
|
||||||
Patch15: 0015.patch
|
|
||||||
Patch16: 0016.patch
|
|
||||||
Patch17: 0017.patch
|
|
||||||
Patch18: 0018.patch
|
|
||||||
Patch19: 0019.patch
|
|
||||||
Patch20: 0020.patch
|
|
||||||
Patch21: 0021.patch
|
|
||||||
Patch22: 0022.patch
|
|
||||||
Patch23: 0023.patch
|
|
||||||
Patch24: 0024.patch
|
|
||||||
Patch25: 0025.patch
|
|
||||||
Patch26: 0026.patch
|
|
||||||
Patch27: 0027.patch
|
|
||||||
Patch28: 0028.patch
|
|
||||||
Patch29: 0029.patch
|
|
||||||
Patch30: 0030.patch
|
|
||||||
Patch31: 0031.patch
|
|
||||||
Patch32: 0032.patch
|
|
||||||
Patch33: 0033.patch
|
|
||||||
Patch34: 0034.patch
|
|
||||||
Patch35: 0035.patch
|
|
||||||
Patch36: 0036.patch
|
|
||||||
Patch37: 0037.patch
|
|
||||||
Patch38: 0038.patch
|
|
||||||
Patch39: 0039.patch
|
|
||||||
Patch40: 0040.patch
|
|
||||||
Patch41: 0041.patch
|
|
||||||
Patch42: 0042.patch
|
|
||||||
Patch43: 0043.patch
|
|
||||||
Patch44: 0044.patch
|
|
||||||
Patch45: 0045.patch
|
|
||||||
Patch46: 0046.patch
|
|
||||||
Patch47: 0047.patch
|
|
||||||
Patch48: 0048.patch
|
|
||||||
Patch49: 0049.patch
|
|
||||||
Patch50: 0050.patch
|
|
||||||
Patch51: 0051.patch
|
|
||||||
Patch52: 0052.patch
|
|
||||||
Patch53: 0053.patch
|
|
||||||
Patch54: 0054.patch
|
|
||||||
Patch55: 0055.patch
|
|
||||||
Patch56: 0056.patch
|
|
||||||
Patch57: 0057.patch
|
|
||||||
Patch58: 0058.patch
|
|
||||||
Patch59: 0059.patch
|
|
||||||
Patch60: 0060.patch
|
|
||||||
Patch61: 0001-fix-graphics-startup-failure-with-the-rhgb-paramter-.patch
|
|
||||||
Patch62: 0001-Include-devfreq-drivers-in-initrd.patch
|
|
||||||
Patch63: 0001-50drm-fix-ambiguous-redirects.patch
|
|
||||||
Patch64: 0002-50drm-Include-drm-platform-drivers-in-hostonly.patch
|
|
||||||
Patch65: 0003-50drm-Check-drm_encoder_init-along-drm_crtc_init.patch
|
|
||||||
# taken from the PR because we really don't need 11 separate patches
|
|
||||||
# for this. Fixes annoying log messages
|
|
||||||
# https://github.com/dracutdevs/dracut/pull/859
|
|
||||||
Patch66: 859.patch
|
|
||||||
|
|
||||||
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
|
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
|
||||||
|
|
||||||
BuildRequires: bash
|
BuildRequires: bash
|
||||||
BuildRequires: git
|
BuildRequires: git-core
|
||||||
BuildRequires: pkgconfig(libkmod) >= 23
|
BuildRequires: pkgconfig(libkmod) >= 23
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
|
||||||
@ -125,11 +61,6 @@ BuildRequires: docbook-xsl-stylesheets libxslt
|
|||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?suse_version} > 9999
|
|
||||||
Obsoletes: mkinitrd < 2.6.1
|
|
||||||
Provides: mkinitrd = 2.6.1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Obsoletes: dracut-fips <= 047
|
Obsoletes: dracut-fips <= 047
|
||||||
Provides: dracut-fips = %{version}-%{release}
|
Provides: dracut-fips = %{version}-%{release}
|
||||||
Obsoletes: dracut-fips-aesni <= 047
|
Obsoletes: dracut-fips-aesni <= 047
|
||||||
@ -285,11 +216,6 @@ echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dr
|
|||||||
rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
|
rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{defined _unitdir}
|
|
||||||
# for systemd, better use systemd-bootchart
|
|
||||||
rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# we do not support dash in the initramfs
|
# we do not support dash in the initramfs
|
||||||
rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
|
rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
|
||||||
|
|
||||||
@ -339,23 +265,16 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse*
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} <= 9999
|
%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} <= 9999
|
||||||
rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd
|
|
||||||
rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
|
rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
|
||||||
rm -f -- $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd.8*
|
|
||||||
rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1*
|
rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
|
echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
|
||||||
echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
||||||
|
|
||||||
%if 0%{?rhel} && 0%{?rhel} <= 8
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
|
|
||||||
install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%if %{with doc}
|
%if %{with doc}
|
||||||
%doc README.md HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg
|
%doc README.md docs/HACKING.md AUTHORS NEWS.md dracut.html docs/dracut.png docs/dracut.svg
|
||||||
%endif
|
%endif
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING lgpl-2.1.txt
|
%license COPYING lgpl-2.1.txt
|
||||||
@ -363,7 +282,6 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|||||||
%{_datadir}/bash-completion/completions/dracut
|
%{_datadir}/bash-completion/completions/dracut
|
||||||
%{_datadir}/bash-completion/completions/lsinitrd
|
%{_datadir}/bash-completion/completions/lsinitrd
|
||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999
|
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999
|
||||||
%{_bindir}/mkinitrd
|
|
||||||
%{_bindir}/lsinitrd
|
%{_bindir}/lsinitrd
|
||||||
%endif
|
%endif
|
||||||
%dir %{dracutlibdir}
|
%dir %{dracutlibdir}
|
||||||
@ -375,6 +293,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|||||||
%{dracutlibdir}/dracut-logger.sh
|
%{dracutlibdir}/dracut-logger.sh
|
||||||
%{dracutlibdir}/dracut-initramfs-restore
|
%{dracutlibdir}/dracut-initramfs-restore
|
||||||
%{dracutlibdir}/dracut-install
|
%{dracutlibdir}/dracut-install
|
||||||
|
%{dracutlibdir}/dracut-util
|
||||||
%{dracutlibdir}/skipcpio
|
%{dracutlibdir}/skipcpio
|
||||||
%config(noreplace) %{_sysconfdir}/dracut.conf
|
%config(noreplace) %{_sysconfdir}/dracut.conf
|
||||||
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
|
||||||
@ -389,12 +308,8 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|||||||
%{_mandir}/man8/dracut.8*
|
%{_mandir}/man8/dracut.8*
|
||||||
%{_mandir}/man8/*service.8*
|
%{_mandir}/man8/*service.8*
|
||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999
|
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999
|
||||||
%{_mandir}/man8/mkinitrd.8*
|
|
||||||
%{_mandir}/man1/lsinitrd.1*
|
%{_mandir}/man1/lsinitrd.1*
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version}
|
|
||||||
%{_mandir}/man8/mkinitrd-suse.8*
|
|
||||||
%endif
|
|
||||||
%{_mandir}/man7/dracut.kernel.7*
|
%{_mandir}/man7/dracut.kernel.7*
|
||||||
%{_mandir}/man7/dracut.cmdline.7*
|
%{_mandir}/man7/dracut.cmdline.7*
|
||||||
%{_mandir}/man7/dracut.modules.7*
|
%{_mandir}/man7/dracut.modules.7*
|
||||||
@ -403,27 +318,50 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{undefined _unitdir}
|
%if %{undefined _unitdir}
|
||||||
%{dracutlibdir}/modules.d/00bootchart
|
|
||||||
%endif
|
%endif
|
||||||
%{dracutlibdir}/modules.d/00bash
|
%{dracutlibdir}/modules.d/00bash
|
||||||
%{dracutlibdir}/modules.d/00systemd
|
%{dracutlibdir}/modules.d/00systemd
|
||||||
|
%{dracutlibdir}/modules.d/00systemd-network-management
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
%{dracutlibdir}/modules.d/00warpclock
|
%{dracutlibdir}/modules.d/00warpclock
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
|
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
|
||||||
%{dracutlibdir}/modules.d/01fips
|
%{dracutlibdir}/modules.d/01fips
|
||||||
%endif
|
%endif
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-ac-power
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-ask-password
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-coredump
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-hostnamed
|
||||||
%{dracutlibdir}/modules.d/01systemd-initrd
|
%{dracutlibdir}/modules.d/01systemd-initrd
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-journald
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-ldconfig
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-modules-load
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-repart
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-resolved
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-rfkill
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-sysext
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-sysctl
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-sysusers
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-timedated
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-timesyncd
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-tmpfiles
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-udevd
|
||||||
|
%{dracutlibdir}/modules.d/01systemd-veritysetup
|
||||||
%{dracutlibdir}/modules.d/03modsign
|
%{dracutlibdir}/modules.d/03modsign
|
||||||
%{dracutlibdir}/modules.d/03rescue
|
%{dracutlibdir}/modules.d/03rescue
|
||||||
%{dracutlibdir}/modules.d/04watchdog
|
%{dracutlibdir}/modules.d/04watchdog
|
||||||
|
%{dracutlibdir}/modules.d/04watchdog-modules
|
||||||
%{dracutlibdir}/modules.d/05busybox
|
%{dracutlibdir}/modules.d/05busybox
|
||||||
|
%{dracutlibdir}/modules.d/06dbus-broker
|
||||||
|
%{dracutlibdir}/modules.d/06dbus-daemon
|
||||||
%{dracutlibdir}/modules.d/06rngd
|
%{dracutlibdir}/modules.d/06rngd
|
||||||
|
%{dracutlibdir}/modules.d/09dbus
|
||||||
%{dracutlibdir}/modules.d/10i18n
|
%{dracutlibdir}/modules.d/10i18n
|
||||||
%{dracutlibdir}/modules.d/30convertfs
|
%{dracutlibdir}/modules.d/30convertfs
|
||||||
%{dracutlibdir}/modules.d/45url-lib
|
%{dracutlibdir}/modules.d/45url-lib
|
||||||
%{dracutlibdir}/modules.d/50drm
|
%{dracutlibdir}/modules.d/50drm
|
||||||
%{dracutlibdir}/modules.d/50plymouth
|
%{dracutlibdir}/modules.d/50plymouth
|
||||||
|
%{dracutlibdir}/modules.d/62bluetooth
|
||||||
%{dracutlibdir}/modules.d/80lvmmerge
|
%{dracutlibdir}/modules.d/80lvmmerge
|
||||||
%{dracutlibdir}/modules.d/90btrfs
|
%{dracutlibdir}/modules.d/90btrfs
|
||||||
%{dracutlibdir}/modules.d/90crypt
|
%{dracutlibdir}/modules.d/90crypt
|
||||||
@ -435,14 +373,15 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|||||||
%{dracutlibdir}/modules.d/90mdraid
|
%{dracutlibdir}/modules.d/90mdraid
|
||||||
%{dracutlibdir}/modules.d/90multipath
|
%{dracutlibdir}/modules.d/90multipath
|
||||||
%{dracutlibdir}/modules.d/90nvdimm
|
%{dracutlibdir}/modules.d/90nvdimm
|
||||||
%{dracutlibdir}/modules.d/90stratis
|
|
||||||
%{dracutlibdir}/modules.d/90ppcmac
|
%{dracutlibdir}/modules.d/90ppcmac
|
||||||
%{dracutlibdir}/modules.d/90qemu
|
%{dracutlibdir}/modules.d/90qemu
|
||||||
%{dracutlibdir}/modules.d/91crypt-gpg
|
%{dracutlibdir}/modules.d/91crypt-gpg
|
||||||
%{dracutlibdir}/modules.d/91crypt-loop
|
%{dracutlibdir}/modules.d/91crypt-loop
|
||||||
|
%{dracutlibdir}/modules.d/91tpm2-tss
|
||||||
%{dracutlibdir}/modules.d/95debug
|
%{dracutlibdir}/modules.d/95debug
|
||||||
%{dracutlibdir}/modules.d/95fstab-sys
|
%{dracutlibdir}/modules.d/95fstab-sys
|
||||||
%{dracutlibdir}/modules.d/95lunmask
|
%{dracutlibdir}/modules.d/95lunmask
|
||||||
|
%{dracutlibdir}/modules.d/95nvmf
|
||||||
%{dracutlibdir}/modules.d/95resume
|
%{dracutlibdir}/modules.d/95resume
|
||||||
%{dracutlibdir}/modules.d/95rootfs-block
|
%{dracutlibdir}/modules.d/95rootfs-block
|
||||||
%{dracutlibdir}/modules.d/95terminfo
|
%{dracutlibdir}/modules.d/95terminfo
|
||||||
@ -499,9 +438,10 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|||||||
%{_prefix}/lib/kernel/install.d/50-dracut.install
|
%{_prefix}/lib/kernel/install.d/50-dracut.install
|
||||||
|
|
||||||
%files network
|
%files network
|
||||||
%{dracutlibdir}/modules.d/02systemd-networkd
|
%{dracutlibdir}/modules.d/01systemd-networkd
|
||||||
%{dracutlibdir}/modules.d/35network-manager
|
%{dracutlibdir}/modules.d/35network-manager
|
||||||
%{dracutlibdir}/modules.d/35network-legacy
|
%{dracutlibdir}/modules.d/35network-legacy
|
||||||
|
%{dracutlibdir}/modules.d/35network-wicked
|
||||||
%{dracutlibdir}/modules.d/40network
|
%{dracutlibdir}/modules.d/40network
|
||||||
%{dracutlibdir}/modules.d/45ifcfg
|
%{dracutlibdir}/modules.d/45ifcfg
|
||||||
%{dracutlibdir}/modules.d/90kernel-network-modules
|
%{dracutlibdir}/modules.d/90kernel-network-modules
|
||||||
@ -546,14 +486,44 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|||||||
%files config-rescue
|
%files config-rescue
|
||||||
%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
||||||
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
|
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
|
||||||
%if 0%{?rhel} && 0%{?rhel} <= 8
|
|
||||||
%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 17 2021 Harald Hoyer <harald@redhat.com> - 054-4.git20210517
|
||||||
|
- version 054
|
||||||
|
|
||||||
|
* Thu Apr 22 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 053-5
|
||||||
|
- Backport: fix(90kernel-modules): add watchdog drivers for generic initrd (rhbz 1592148)
|
||||||
|
|
||||||
|
* Mon Apr 19 2021 Dusty Mabe <dusty@dustymabe.com> - 053-4
|
||||||
|
- Backport: fix(dracut-logger.sh): double dash trigger unknown logger warnings during run
|
||||||
|
- Backport: fix(network-manager): nm-run.service: don't kill forked processes
|
||||||
|
- Backport: fix(network-manager): only run NetworkManager if rd.neednet=1
|
||||||
|
- Backport: fix(network-manager): use /run/NetworkManager/initrd/neednet in initqueue
|
||||||
|
|
||||||
|
* Mon Apr 19 2021 Adam Williamson <awilliam@redhat.com> - 053-3
|
||||||
|
- Fix removal of key system files when kdump enabled (thanks kasong) (#1936781)
|
||||||
|
|
||||||
|
* Thu Apr 08 2021 Adam Williamson <awilliam@redhat.com> - 053-2
|
||||||
|
- Backport upstream change reported to fix boot on some encrypted LVM setups (#1946074)
|
||||||
|
|
||||||
|
* Tue Feb 23 2021 Harald Hoyer <harald@redhat.com> - 053-1
|
||||||
|
- version 053
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 051-1.1
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Dec 15 2020 Harald Hoyer <harald@redhat.com> - 051-1
|
||||||
|
- version 051
|
||||||
|
|
||||||
* Fri Oct 23 2020 Adam Williamson <awilliam@redhat.com> - 050-64.git20200529
|
* Fri Oct 23 2020 Adam Williamson <awilliam@redhat.com> - 050-64.git20200529
|
||||||
- Backport fix for systemd warnings about logging arguments
|
- Backport fix for systemd warnings about logging arguments
|
||||||
|
|
||||||
|
* Tue Oct 06 2020 Harald Hoyer <harald@redhat.com> - 050-167.git20201006
|
||||||
|
- git snapshot
|
||||||
|
|
||||||
|
* Fri Oct 02 2020 Harald Hoyer <harald@redhat.com> - 050-157.git20201002
|
||||||
|
- git snapshot
|
||||||
|
|
||||||
* Tue Sep 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 050-63.git20200529
|
* Tue Sep 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 050-63.git20200529
|
||||||
- Fixes for Arm GPUs in early boot
|
- Fixes for Arm GPUs in early boot
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (dracut-050.tar.xz) = 9d9a66acfd6b9d2fd50855a59a2393e0602c2ef97119db046f68d6167ea84d1423fa465b8b4d96339febb38d5a96df26dec7862c4b3397c3d726db18d280eee4
|
SHA512 (dracut-054.tar.xz) = 7cff87b9cc6c7323044610c4ddda9685a8eba4ebd320fa39071707d6c324ed69da722ecb0257be9bbf2bb8bc11fed6a3dc7c34c5d8229e00b6f261835a33503b
|
||||||
|
Loading…
Reference in New Issue
Block a user