rpms/dracut
7
0
Fork 0
Code Issues Pull Requests Releases Activity

dracut-050-157.git20201002

Browse Source 
git snapshot
This commit is contained in:
Harald Hoyer 2020-10-02 14:08:26 +02:00
parent faebfd0d20
commit 460d2c99f9
100 changed files with 7446 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0042.patch
View File

@ -10,14 +10,14 @@ Also simplify make_trace_mem a bit.
And currently rd.memdebug=4 is unstable, fails from time to time. And currently rd.memdebug=4 is unstable, fails from time to time.
--- ---
dracut.cmdline.7.asc | 4 +-- dracut.cmdline.7.asc | 4 +-
modules.d/98dracut-systemd/dracut-cmdline.sh | 2 +- modules.d/98dracut-systemd/dracut-cmdline.sh | 2 +-
modules.d/98dracut-systemd/dracut-pre-mount.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-pivot.sh | 2 +-
modules.d/98dracut-systemd/dracut-pre-trigger.sh | 2 +- modules.d/98dracut-systemd/dracut-pre-trigger.sh | 2 +-
modules.d/99base/dracut-lib.sh | 44 +++++------------------- modules.d/99base/dracut-lib.sh | 44 +-----
modules.d/99base/init.sh | 8 ++--- modules.d/99base/init.sh | 8 +-
modules.d/99base/memtrace-ko.sh | 191 ----------------------------------------------------------------------------------------------------- modules.d/99base/memtrace-ko.sh | 191 -----------------------
modules.d/99base/module-setup.sh | 1 - modules.d/99base/module-setup.sh | 1 -
9 files changed, 18 insertions(+), 238 deletions(-) 9 files changed, 18 insertions(+), 238 deletions(-)

12
0043.patch
View File

@ -82,13 +82,13 @@ the stack trace of the top memory user, also printed on pri-pivot:
This could be very helpful for debuging memory usage issues. This could be very helpful for debuging memory usage issues.
--- ---
dracut.cmdline.7.asc | 16 ++++++++++------ dracut.cmdline.7.asc | 16 +++++---
dracut.spec | 2 ++ dracut.spec | 2 +
modules.d/99base/dracut-lib.sh | 2 +- modules.d/99base/dracut-lib.sh | 2 +-
modules.d/99memstrack/memstrack-report.sh | 23 +++++++++++++++++++++++ modules.d/99memstrack/memstrack-report.sh | 23 +++++++++++
modules.d/99memstrack/memstrack-start.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ modules.d/99memstrack/memstrack-start.sh | 68 +++++++++++++++++++++++++++++++
modules.d/99memstrack/memstrack.service | 13 +++++++++++++ modules.d/99memstrack/memstrack.service | 13 ++++++
modules.d/99memstrack/module-setup.sh | 27 +++++++++++++++++++++++++++ modules.d/99memstrack/module-setup.sh | 27 ++++++++++++
7 files changed, 144 insertions(+), 7 deletions(-) 7 files changed, 144 insertions(+), 7 deletions(-)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc

1
0060.patch
View File

@ -57,3 +57,4 @@ index 1eb47402..4d1cb7a4 100644
as possible into the initramfs. dracut contains various modules which as possible into the initramfs. dracut contains various modules which
are driven by the event-based udev. Having root on MD, DM, LVM2, LUKS 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 is supported as well as NFS, iSCSI, NBD, FCoE with the dracut-network

109
0061.patch Normal file
View File

@ -0,0 +1,109 @@
From 5f8063c6f2944fc93af5d6d800197e8c966ba70f Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Fri, 10 Apr 2020 20:50:49 +0800
Subject: [PATCH] 95nfs: only install rpc services for NFS < 4 when hostonly is
strict
Most rpc services are not needed for NFSv4, so skip these components
to save space. rpc.idmapd is still needed in case of
nfs4_disable_idmapping is set to 0.
---
modules.d/95nfs/module-setup.sh | 33 ++++++++++++++++++++++++++-------
modules.d/95nfs/nfs-start-rpc.sh | 6 ++----
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
index f9bcedd1..d9a91fdf 100755
--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -1,5 +1,22 @@
#!/bin/bash
+# return value:
+# 'nfs4': Only nfs4 founded
+# 'nfs': nfs with version < 4 founded
+# '': No nfs founded
+get_nfs_type() {
+ local _nfs _nfs4
+
+ for fs in "${host_fs_types[@]}"; do
+ [[ "$fs" == "nfs" ]] && _nfs=1
+ [[ "$fs" == "nfs3" ]] && _nfs=1
+ [[ "$fs" == "nfs4" ]] && _nfs4=1
+ done
+
+ [[ "$_nfs" ]] && echo "nfs" && return
+ [[ "$_nfs4" ]] && echo "nfs4" && return
+}
+
# called by dracut
check() {
# If our prerequisites are not met, fail anyways.
@@ -7,11 +24,7 @@ check() {
require_binaries rpc.statd mount.nfs mount.nfs4 umount || return 1
[[ $hostonly ]] || [[ $mount_needs ]] && {
- for fs in "${host_fs_types[@]}"; do
- [[ "$fs" == "nfs" ]] && return 0
- [[ "$fs" == "nfs3" ]] && return 0
- [[ "$fs" == "nfs4" ]] && return 0
- done
+ [[ "$(get_nfs_type)" ]] && return 0
return 255
}
return 0
@@ -77,8 +90,7 @@ cmdline() {
install() {
local _i
local _nsslibs
- inst_multiple -o portmap rpcbind rpc.statd mount.nfs \
- mount.nfs4 umount rpc.idmapd sed /etc/netconfig chmod "$tmpfilesdir/rpcbind.conf"
+ inst_multiple -o rpc.idmapd mount.nfs mount.nfs4 umount sed /etc/netconfig chmod "$tmpfilesdir/rpcbind.conf"
inst_multiple /etc/services /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf
if [[ $hostonly_cmdline == "yes" ]]; then
@@ -106,6 +118,12 @@ install() {
inst_hook pre-udev 99 "$moddir/nfs-start-rpc.sh"
inst_hook cleanup 99 "$moddir/nfsroot-cleanup.sh"
inst "$moddir/nfsroot.sh" "/sbin/nfsroot"
+
+ # For strict hostonly, only install rpcbind for NFS < 4
+ if [[ $hostonly_mode != "strict" ]] || [[ "$(get_nfs_type)" != "nfs4" ]]; then
+ inst_multiple -o portmap rpcbind rpc.statd
+ fi
+
inst "$moddir/nfs-lib.sh" "/lib/nfs-lib.sh"
mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
mkdir -m 0770 -p "$initdir/var/lib/rpcbind"
@@ -121,5 +139,6 @@ install() {
chmod 770 "$initdir/var/lib/rpcbind"
grep -q '^rpc:' $dracutsysrootdir/etc/passwd \
&& grep -q '^rpc:' $dracutsysrootdir/etc/group
+
dracut_need_initqueue
}
diff --git a/modules.d/95nfs/nfs-start-rpc.sh b/modules.d/95nfs/nfs-start-rpc.sh
index 694e05e2..dadfd90a 100755
--- a/modules.d/95nfs/nfs-start-rpc.sh
+++ b/modules.d/95nfs/nfs-start-rpc.sh
@@ -1,8 +1,6 @@
#!/bin/sh
-
if modprobe sunrpc || strstr "$(cat /proc/filesystems)" rpc_pipefs; then
-
[ ! -d /var/lib/nfs/rpc_pipefs/nfs ] && \
mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
@@ -17,8 +15,8 @@ if modprobe sunrpc || strstr "$(cat /proc/filesystems)" rpc_pipefs; then
# Start rpc.statd as mount won't let us use locks on a NFSv4
# filesystem without talking to it. NFSv4 does locks internally,
# rpc.lockd isn't needed
- [ -z "$(pidof rpc.statd)" ] && rpc.statd
- [ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd
+ command -v rpc.statd >/dev/null && [ -z "$(pidof rpc.statd)" ] && rpc.statd
+ command -v rpc.idmapd >/dev/null && [ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd
else
warn 'Kernel module "sunrpc" not in the initramfs, or support for filesystem "rpc_pipefs" missing!'
fi

222
0062.patch Normal file
View File

@ -0,0 +1,222 @@
From 2f03d69f9dfdc0c905c4d9cb69ee93a5256123cb Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.com>
Date: Mon, 25 Nov 2019 11:33:42 +0100
Subject: [PATCH] 95nvmf: add module for NVMe-oF
Add a module for booting from NVMe-oF devices.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
dracut.spec | 1 +
modules.d/95nvmf/module-setup.sh | 88 +++++++++++++++++++++++
modules.d/95nvmf/parse-nvmf-boot-connections.sh | 95 +++++++++++++++++++++++++
3 files changed, 184 insertions(+)
diff --git a/dracut.spec b/dracut.spec
index 4d1cb7a4..872c21cf 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -374,6 +374,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
%{dracutlibdir}/modules.d/95debug
%{dracutlibdir}/modules.d/95fstab-sys
%{dracutlibdir}/modules.d/95lunmask
+%{dracutlibdir}/modules.d/95nvmf
%{dracutlibdir}/modules.d/95resume
%{dracutlibdir}/modules.d/95rootfs-block
%{dracutlibdir}/modules.d/95terminfo
diff --git a/modules.d/95nvmf/module-setup.sh b/modules.d/95nvmf/module-setup.sh
new file mode 100755
index 00000000..db43ec01
--- /dev/null
+++ b/modules.d/95nvmf/module-setup.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# called by dracut
+check() {
+ require_binaries nvme || return 1
+ [ -f /etc/nvme/hostnqn ] || return 255
+ [ -f /etc/nvme/hostid ] || return 255
+
+ is_nvme_fc() {
+ local _dev=$1
+ local traddr
+
+ [[ -L "/sys/dev/block/$_dev" ]] || return 0
+ cd -P "/sys/dev/block/$_dev" || return 0
+ if [ -f partition ] ; then
+ cd ..
+ fi
+ for d in device/nvme* ; do
+ [ -L "$d" ] || continue
+ if readlink "$d" | grep -q nvme-fabrics ; then
+ traddr=$(cat "$d"/address)
+ break
+ fi
+ done
+ [[ "${traddr#traddr=nn-}" != "$traddr" ]]
+ }
+
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
+ pushd . >/dev/null
+ for_each_host_dev_and_slaves is_nvme_fc
+ local _is_nvme_fc=$?
+ popd >/dev/null
+ [[ $_is_nvme_fc == 0 ]] || return 255
+ if [ ! -f /sys/class/fc/fc_udev_device/nvme_discovery ] ; then
+ if [ ! -f /etc/nvme/discovery.conf ] ; then
+ echo "No discovery arguments present"
+ return 255
+ fi
+ fi
+ }
+ return 0
+}
+
+# called by dracut
+depends() {
+ echo bash rootfs-block
+ return 0
+}
+
+# called by dracut
+installkernel() {
+ instmods nvme_fc lpfc qla2xxx
+}
+
+# called by dracut
+cmdline() {
+ local _hostnqn
+ local _hostid
+ if [ -f /etc/nvme/hostnqn ] ; then
+ _hostnqn=$(cat /etc/nvme/hostnqn)
+ echo -n " nvmf.hostnqn=${_hostnqn}"
+ fi
+ if [ -f /etc/nvme/hostid ] ; then
+ _hostid=$(cat /etc/nvme/hostid)
+ echo -n " nvmf.hostid=${_hostid}"
+ fi
+ echo ""
+}
+
+# called by dracut
+install() {
+ if [[ $hostonly_cmdline == "yes" ]]; then
+ local _nvmf_args=$(cmdline)
+ [[ "$_nvmf_args" ]] && printf "%s" "$_nvmf_args" >> "${initdir}/etc/cmdline.d/95nvmf-args.conf"
+ fi
+ inst_simple "/etc/nvme/hostnqn"
+ inst_simple "/etc/nvme/hostid"
+
+ inst_multiple nvme
+ inst_multiple -o \
+ "$systemdsystemunitdir/nvm*-connect@.service" \
+ "$systemdsystemunitdir/nvm*-connect.target"
+ inst_hook cmdline 99 "$moddir/parse-nvmf-boot-connections.sh"
+ inst_simple "/etc/nvme/discovery.conf"
+ inst_rules /usr/lib/udev/rules.d/70-nvm*-autoconnect.rules
+ inst_rules /usr/lib/udev/rules.d/71-nvmf-iopolicy-netapp.rules
+ dracut_need_initqueue
+}
diff --git a/modules.d/95nvmf/parse-nvmf-boot-connections.sh b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
new file mode 100755
index 00000000..0d16b871
--- /dev/null
+++ b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# Supported formats:
+# nvmf.hostnqn=<hostnqn>
+# nvmf.hostid=<hostid>
+# nvmf.discover=<transport>:<traddr>:<host-traddr>:<trsvcid>
+#
+# Examples:
+# nvmf.hostnqn=nqn.2014-08.org.nvmexpress:uuid:37303738-3034-584d-5137-333230423843
+# nvmf.discover=rdma:192.168.1.3::4420
+# nvmf.discover=fc:auto
+#
+# Note: FC does autodiscovery, so typically there is no need to
+# specify any discover parameters for FC.
+#
+
+parse_nvmf_discover() {
+ OLDIFS="$IFS"
+ IFS=:
+ trtype="none"
+ traddr="none"
+ hosttraddr="none"
+ trsvcid=4420
+
+ set $1
+ IFS="$OLDIFS"
+
+ case $# in
+ 2)
+ trtype=$1
+ traddr=$2
+ ;;
+ 3)
+ trtype=$1
+ traddr=$2
+ hosttraddr=$3
+ ;;
+ 4)
+ trtype=$1
+ traddr=$2
+ hosttraddr=$3
+ trsvcid=$4
+ ;;
+ *)
+ warn "Invalid arguments for nvmf.discover=$1"
+ return 1
+ ;;
+ esac
+ if [ -z "$traddr" ] ; then
+ warn "traddr is mandatory for $trtype"
+ return 1;
+ fi
+ [ -z "$hosttraddr" ] && hosttraddr="none"
+ [ -z "$trsvcid" ] && trsvcid="none"
+ if [ "$trtype" = "fc" ] ; then
+ if [ -z "$hosttraddr" ] ; then
+ warn "host traddr is mandatory for fc"
+ return 1
+ fi
+ elif [ "$trtype" != "rdma" ] && [ "$trtype" != "tcp" ] ; then
+ warn "unsupported transport $trtype"
+ return 1
+ elif [ -z "$trsvcid" ] ; then
+ trsvcid=4420
+ fi
+ echo "--transport=$trtype --traddr=$traddr --host-traddr=$hosttraddr --trsvcid=$trsvcid" >> /etc/nvme/discovery.conf
+}
+
+if ! getargbool 0 rd.nonvmf ; then
+ info "rd.nonvmf=0: skipping nvmf"
+ return 0
+fi
+
+nvmf_hostnqn=$(getarg nvmf.hostnqn=)
+if [ -n "$nvmf_hostnqn" ] ; then
+ echo "$nvmf_hostnqn" > /etc/nvme/hostnqn
+fi
+nvmf_hostid=$(getarg nvmf.hostid=)
+if [ -n "$nvmf_hostid" ] ; then
+ echo "$nvmf_hostid" > /etc/nvme/hostid
+fi
+
+for d in $(getargs nvmf.discover=); do
+ parse_nvmf_discover "$d"
+done
+
+# Host NQN and host id are mandatory for NVMe-oF
+[ -f "/etc/nvme/hostnqn" ] || exit 0
+[ -f "/etc/nvme/hostid" ] || exit 0
+
+if [ -f "/etc/nvme/discovery.conf" ] ; then
+ /sbin/initqueue --onetime --unique --name nvme-discover /usr/sbin/nvme connect-all
+else
+ /sbin/initqueue --finished --unique --name nvme-fc-autoconnect echo 1 > /sys/class/fc/fc_udev_device/nvme_discovery
+fi

24
0063.patch Normal file
View File

@ -0,0 +1,24 @@
From 55b0d2edafdd18c2e85f47063f0ac81652f86956 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Wed, 10 Jun 2020 22:36:56 +0200
Subject: [PATCH] 95iscsi: fix missing space when compiling cmdline args
Reference: bsc#1172816
---
modules.d/95iscsi/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index 19a8bdbd..8b6300d5 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -65,7 +65,7 @@ install_ibft() {
if [ ${d##*/} = "ibft" ] && [ "$ibft_mod" != "bnx2i" ] ; then
echo -n "rd.iscsi.ibft=1 "
fi
- echo -n "rd.iscsi.firmware=1"
+ echo -n "rd.iscsi.firmware=1 "
fi
done
}

78
0064.patch Normal file
View File

@ -0,0 +1,78 @@
From 6e1e87cd2567801b10b2b4f716436c48688408bf Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 24 Jun 2020 13:06:05 +0200
Subject: [PATCH] network-manager: move connection generation to a lib file
Move the connection generation code to a library file so that it can
be reused from other places.
---
modules.d/35network-manager/module-setup.sh | 1 +
modules.d/35network-manager/nm-config.sh | 15 +++------------
modules.d/35network-manager/nm-lib.sh | 20 ++++++++++++++++++++
3 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
index ad2a1534..ed2f399e 100755
--- a/modules.d/35network-manager/module-setup.sh
+++ b/modules.d/35network-manager/module-setup.sh
@@ -37,6 +37,7 @@ install() {
inst_hook initqueue/settled 99 "$moddir/nm-run.sh"
inst_rules 85-nm-unmanaged.rules
inst_libdir_file "NetworkManager/$_nm_version/libnm-device-plugin-team.so"
+ inst_simple "$moddir/nm-lib.sh" "/lib/nm-lib.sh"
if [[ -x "$initdir/usr/sbin/dhclient" ]]; then
inst /usr/libexec/nm-dhcp-helper
diff --git a/modules.d/35network-manager/nm-config.sh b/modules.d/35network-manager/nm-config.sh
index 39a1c8bd..2b9df020 100755
--- a/modules.d/35network-manager/nm-config.sh
+++ b/modules.d/35network-manager/nm-config.sh
@@ -1,18 +1,9 @@
#!/bin/sh
+type nm_generate_connections >/dev/null 2>&1 || . /lib/nm-lib.sh
+
if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
echo rd.neednet >> /etc/cmdline.d/35-neednet.conf
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
+nm_generate_connections
diff --git a/modules.d/35network-manager/nm-lib.sh b/modules.d/35network-manager/nm-lib.sh
new file mode 100644
index 00000000..fe053cfa
--- /dev/null
+++ b/modules.d/35network-manager/nm-lib.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+type getcmdline >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+nm_generate_connections()
+{
+ rm -f /run/NetworkManager/system-connections/*
+ /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
+}

30
0065.patch Normal file
View File

@ -0,0 +1,30 @@
From 5c3d0a96473ac339fa2d1b25213b8f301c1cfd0d Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 24 Jun 2020 13:09:04 +0200
Subject: [PATCH] cms: regenerate NetworkManager connections
After changing the kernel command line, the cmsifup script calls ifup
to activate the interface. However, ifup is only available in the
network-legacy module; when using the network-manager module, we
should regenerate connections according to the command line; then
later NM will be run and will activate the device.
---
modules.d/80cms/cmsifup.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules.d/80cms/cmsifup.sh b/modules.d/80cms/cmsifup.sh
index 902df8d8..77c18452 100755
--- a/modules.d/80cms/cmsifup.sh
+++ b/modules.d/80cms/cmsifup.sh
@@ -35,4 +35,9 @@ fi
IFACES="$IFACES $DEVICE"
echo "$IFACES" >> /tmp/net.ifaces
-exec ifup "$DEVICE"
+if [ -x /usr/libexec/nm-initrd-generator ]; then
+ type nm_generate_connections >/dev/null 2>&1 || . /lib/nm-lib.sh
+ nm_generate_connections
+else
+ exec ifup "$DEVICE"
+fi

47
0066.patch Normal file
View File

@ -0,0 +1,47 @@
From 6dafdda4a6bdb8721133e4267553c5d86564f9e8 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 2 Jul 2020 09:08:03 +0200
Subject: [PATCH] install: also install post weak dependencies of kernel
modules
---
install/dracut-install.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/install/dracut-install.c b/install/dracut-install.c
index 3d64ed7a..9fbd72cd 100644
--- a/install/dracut-install.c
+++ b/install/dracut-install.c
@@ -1482,9 +1482,13 @@ static int install_dependent_modules(struct kmod_list *modlist)
ret = install_dependent_modules(modlist);
if (ret == 0) {
ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
- if (ret == 0)
- ret = install_dependent_modules(modpre);
- }
+ if (ret == 0) {
+ int r;
+ ret = install_dependent_modules(modpre);
+ r = install_dependent_modules(modpost);
+ ret = ret ? : r;
+ }
+ }
} else {
log_error("dracut_install '%s' '%s' ERROR", path, &path[kerneldirlen]);
}
@@ -1545,8 +1549,12 @@ static int install_module(struct kmod_module *mod)
if (ret == 0) {
ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
- if (ret == 0)
- ret = install_dependent_modules(modpre);
+ if (ret == 0) {
+ int r;
+ ret = install_dependent_modules(modpre);
+ r = install_dependent_modules(modpost);
+ ret = ret ? : r;
+ }
}
return ret;

51
0067.patch Normal file
View File

@ -0,0 +1,51 @@
From de3cb0e3214c3fbab3a94e705445b4d1c2bf0dff Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Tue, 9 Jun 2020 03:03:18 +0800
Subject: [PATCH] dracut.sh: Move the library workaround after squash
Ensure the workaround is also valid when dracut-squash module is used
Signed-off-by: Kairui Song <kasong@redhat.com>
---
dracut.sh | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/dracut.sh b/dracut.sh
index 81c6d654..9ee722c9 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1661,15 +1661,6 @@ if [[ $kernel_only != yes ]]; then
# Now we are done with lazy resolving, always install dependencies
unset DRACUT_RESOLVE_LAZY
export DRACUT_RESOLVE_DEPS=1
-
- # libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
- for _dir in $libdirs; do
- for _f in "$dracutsysrootdir$_dir/libpthread.so"*; do
- [[ -e "$_f" ]] || continue
- inst_libdir_file "libgcc_s.so*"
- break 2
- done
- done
fi
for ((i=0; i < ${#include_src[@]}; i++)); do
@@ -1941,6 +1932,17 @@ if dracut_module_included "squash"; then
done
fi
+if [[ $kernel_only != yes ]]; then
+ # libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
+ for _dir in $libdirs; do
+ for _f in "$dracutsysrootdir$_dir/libpthread.so"*; do
+ [[ -e "$_f" ]] || continue
+ inst_libdir_file "libgcc_s.so*"
+ break 2
+ done
+ done
+fi
+
if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
dinfo "*** Stripping files ***"
find "$initdir" -type f \

40
0068.patch Normal file
View File

@ -0,0 +1,40 @@
From 5a4c3469338410b6aea9452994b4b0af1ba59be7 Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Wed, 10 Jun 2020 15:57:20 +0800
Subject: [PATCH] dracut.sh: FIPS workaround for openssl-libs on Fedora/RHEL
On Fedora/RHEL, libcryto will verify both itself and libssl on start, if
libssl is missing, FIPS self test will fail. However libssl is not a
dependency of libcryto so dracut will not install it, unless some other
binary or library pulls it in. Systemd requires libssl, so in most cases
it just worked, but could fail in some corner cases where systemd is not
used.
Signed-off-by: Kairui Song <kasong@redhat.com>
---
dracut.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dracut.sh b/dracut.sh
index 9ee722c9..e3195499 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1941,6 +1941,17 @@ if [[ $kernel_only != yes ]]; then
break 2
done
done
+
+ # FIPS workaround for Fedora/RHEL: libcrypto needs libssl when FIPS is enabled
+ if [[ $DRACUT_FIPS_MODE ]]; then
+ for _dir in $libdirs; do
+ for _f in "$dracutsysrootdir$_dir/libcrypto.so"*; do
+ [[ -e "$_f" ]] || continue
+ inst_libdir_file -o "libssl.so*"
+ break 2
+ done
+ done
+ fi
fi
if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then

25
0069.patch Normal file
View File

@ -0,0 +1,25 @@
From 46f3156426e1b770e4876a654738e1c3e01851af Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.de>
Date: Fri, 26 Jun 2020 18:50:47 +0200
Subject: [PATCH] 91zipl: parse-zipl.sh: honor SYSTEMD_READY
The zipl partition should not be mounted if SYSTEMD_READY=0 is set.
Otherwise booting issues with multipath will result.
---
modules.d/91zipl/parse-zipl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/91zipl/parse-zipl.sh b/modules.d/91zipl/parse-zipl.sh
index 308f228b..ddab0ea9 100755
--- a/modules.d/91zipl/parse-zipl.sh
+++ b/modules.d/91zipl/parse-zipl.sh
@@ -31,7 +31,7 @@ if [ -n "$zipl_arg" ] ; then
esac
if [ "$zipl_env" ] ; then
{
- printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", RUN+="/sbin/initqueue --settled --onetime --unique --name install_zipl_cmdline /sbin/install_zipl_cmdline.sh %s"\n' \
+ printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", ENV{SYSTEMD_READY}!="0", RUN+="/sbin/initqueue --settled --onetime --unique --name install_zipl_cmdline /sbin/install_zipl_cmdline.sh %s"\n' \
${zipl_env} ${zipl_val} ${zipl_arg}
echo "[ -f /tmp/install.zipl.cmdline-done ]" >$hookdir/initqueue/finished/wait-zipl-conf.sh
} >> /etc/udev/rules.d/99zipl-conf.rules

26
0070.patch Normal file
View File

@ -0,0 +1,26 @@
From 3b869230a08088a4f51d5bde8d5cfc8497779815 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Mon, 6 Jul 2020 15:16:35 +0200
Subject: [PATCH] 95iscsi: fix ipv6 target discovery
ipv6 addresses need square brackets, otherwise the iscsi discovery and log-in,
which adds the iscsi port after another colon will get confused and fail.
---
modules.d/95iscsi/iscsiroot.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
index cc2ed2cc..ac43b487 100755
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -213,6 +213,9 @@ handle_netroot()
echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
fi
+ if strglobin $iscsi_target_ip '*:*:*' && ! strglobin $iscsi_target_ip '['; then
+ iscsi_target_ip="[$iscsi_target_ip]"
+ fi
targets=$(iscsiadm -m discovery -t st -p $iscsi_target_ip:${iscsi_target_port:+$iscsi_target_port} | sed 's/^.*iqn/iqn/')
[ -z "$targets" ] && echo "Target discovery to $iscsi_target_ip:${iscsi_target_port:+$iscsi_target_port} failed with status $?" && exit 1

55
0071.patch Normal file
View File

@ -0,0 +1,55 @@
From d8d5cb839cbddff7d73a12450055f14dce4ce1e2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jul 2020 17:28:16 +0200
Subject: [PATCH] dracut.sh: fix early microcode detection logic
This fixes two issues:
1) on non-x86 systems in non-hostonly config this would cause
an annoying warning on every initramfs generation
2) on non-x86 systems in hostonly config this would result in
early microcode not getting disabled
---
dracut.sh | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/dracut.sh b/dracut.sh
index e3195499..d5dfa77d 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1194,19 +1194,26 @@ fi
if [[ $early_microcode = yes ]]; then
if [[ $hostonly ]]; then
- [[ $(get_cpu_vendor) == "AMD" ]] \
- && ! check_kernel_config CONFIG_MICROCODE_AMD \
- && unset early_microcode
- [[ $(get_cpu_vendor) == "Intel" ]] \
- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
- && unset early_microcode
+ if [[ $(get_cpu_vendor) == "AMD" ]]; then
+ check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
+ elif [[ $(get_cpu_vendor) == "Intel" ]]; then
+ check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
+ else
+ unset early_microcode
+ fi
else
! check_kernel_config CONFIG_MICROCODE_AMD \
&& ! check_kernel_config CONFIG_MICROCODE_INTEL \
&& unset early_microcode
fi
- [[ $early_microcode != yes ]] \
- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
+ # Do not complain on non-x86 architectures as it makes no sense
+ case $(uname -m) in
+ x86_64|i?86)
+ [[ $early_microcode != yes ]] \
+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
+ ;;
+ *) ;;
+ esac
fi
# Need to be able to have non-root users read stuff (rpcbind etc)

24
0072.patch Normal file
View File

@ -0,0 +1,24 @@
From 265f696b532f63f0ac1f9f341e0469a6eafe2fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:26:00 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/90stratis/stratisd-init.service | 2 --
1 file changed, 2 deletions(-)
diff --git a/modules.d/90stratis/stratisd-init.service b/modules.d/90stratis/stratisd-init.service
index 318e8c27..1be2e33b 100644
--- a/modules.d/90stratis/stratisd-init.service
+++ b/modules.d/90stratis/stratisd-init.service
@@ -8,8 +8,6 @@ DefaultDependencies=no
Type=simple
ExecStart=/sbin/stratisd-init --debug
KillSignal=SIGINT
-StandardOutput=syslog
-StandardError=syslog
[Install]
WantedBy=sysinit.target

24
0073.patch Normal file
View File

@ -0,0 +1,24 @@
From 38ba90bf88b38228e128c65be40a2da287c0b1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:29:34 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/99squash/squash-mnt-clear.service | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/99squash/squash-mnt-clear.service b/modules.d/99squash/squash-mnt-clear.service
index 84441f60..9d94c524 100644
--- a/modules.d/99squash/squash-mnt-clear.service
+++ b/modules.d/99squash/squash-mnt-clear.service
@@ -12,6 +12,6 @@ ConditionPathExists=/squash/root
Type=oneshot
RemainAfterExit=no
StandardInput=null
-StandardOutput=syslog+console
-StandardError=syslog+console
+StandardOutput=journal+console
+StandardError=journal+console
ExecStart=/squash/clear-squash.sh

25
0074.patch Normal file
View File

@ -0,0 +1,25 @@
From 5cb2a4004d18e4b96ddc18f221fae922350a9000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:31:17 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/98dracut-systemd/dracut-pre-trigger.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules.d/98dracut-systemd/dracut-pre-trigger.service b/modules.d/98dracut-systemd/dracut-pre-trigger.service
index 7bf16167..6f1ba521 100644
--- a/modules.d/98dracut-systemd/dracut-pre-trigger.service
+++ b/modules.d/98dracut-systemd/dracut-pre-trigger.service
@@ -20,8 +20,7 @@ Environment=NEWROOT=/sysroot
Type=oneshot
ExecStart=-/bin/dracut-pre-trigger
StandardInput=null
-StandardOutput=syslog
-StandardError=syslog+console
+StandardError=journal+console
KillMode=process
RemainAfterExit=yes

25
0075.patch Normal file
View File

@ -0,0 +1,25 @@
From 317d841c788e841d3533515ceda5597a099eb64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:31:59 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/98dracut-systemd/dracut-initqueue.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service
index 207d545d..3a8679a5 100644
--- a/modules.d/98dracut-systemd/dracut-initqueue.service
+++ b/modules.d/98dracut-systemd/dracut-initqueue.service
@@ -21,8 +21,7 @@ Environment=NEWROOT=/sysroot
Type=oneshot
ExecStart=-/bin/dracut-initqueue
StandardInput=null
-StandardOutput=syslog
-StandardError=syslog+console
+StandardError=journal+console
KillMode=process
RemainAfterExit=yes

25
0076.patch Normal file
View File

@ -0,0 +1,25 @@
From 0c1bd016ecfb9c6d194c4356199b509d90db4071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:32:44 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/98dracut-systemd/dracut-pre-pivot.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.service b/modules.d/98dracut-systemd/dracut-pre-pivot.service
index 9a1f0854..e893d1dd 100644
--- a/modules.d/98dracut-systemd/dracut-pre-pivot.service
+++ b/modules.d/98dracut-systemd/dracut-pre-pivot.service
@@ -27,8 +27,7 @@ Environment=NEWROOT=/sysroot
Type=oneshot
ExecStart=-/bin/dracut-pre-pivot
StandardInput=null
-StandardOutput=syslog
-StandardError=syslog+console
+StandardError=journal+console
KillMode=process
RemainAfterExit=yes

25
0077.patch Normal file
View File

@ -0,0 +1,25 @@
From e1130a83405648777210fdc99f7eee087eebaadc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:33:33 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/98dracut-systemd/dracut-pre-udev.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service
index 570ec02d..e4092e35 100644
--- a/modules.d/98dracut-systemd/dracut-pre-udev.service
+++ b/modules.d/98dracut-systemd/dracut-pre-udev.service
@@ -24,8 +24,7 @@ Environment=NEWROOT=/sysroot
Type=oneshot
ExecStart=-/bin/dracut-pre-udev
StandardInput=null
-StandardOutput=syslog
-StandardError=syslog+console
+StandardError=journal+console
KillMode=process
RemainAfterExit=yes

25
0078.patch Normal file
View File

@ -0,0 +1,25 @@
From c437933cb0490e800e776cb7695d2ea0e95056a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:34:17 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/98dracut-systemd/dracut-pre-mount.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules.d/98dracut-systemd/dracut-pre-mount.service b/modules.d/98dracut-systemd/dracut-pre-mount.service
index d3909689..18c9730c 100644
--- a/modules.d/98dracut-systemd/dracut-pre-mount.service
+++ b/modules.d/98dracut-systemd/dracut-pre-mount.service
@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot
Type=oneshot
ExecStart=-/bin/dracut-pre-mount
StandardInput=null
-StandardOutput=syslog
-StandardError=syslog+console
+StandardError=journal+console
KillMode=process
RemainAfterExit=yes

25
0079.patch Normal file
View File

@ -0,0 +1,25 @@
From d9149c6ca7c52c204c1b346e9b6a32bbadd0b2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:35:02 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/98dracut-systemd/dracut-cmdline.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules.d/98dracut-systemd/dracut-cmdline.service b/modules.d/98dracut-systemd/dracut-cmdline.service
index e577ec88..a8078bd2 100644
--- a/modules.d/98dracut-systemd/dracut-cmdline.service
+++ b/modules.d/98dracut-systemd/dracut-cmdline.service
@@ -23,8 +23,7 @@ Environment=NEWROOT=/sysroot
Type=oneshot
ExecStart=-/bin/dracut-cmdline
StandardInput=null
-StandardOutput=syslog
-StandardError=syslog+console
+StandardError=journal+console
KillMode=process
RemainAfterExit=yes

25
0080.patch Normal file
View File

@ -0,0 +1,25 @@
From 8cb5ac1b30be458df9497911ba601d90e68f4d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:35:38 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/98dracut-systemd/dracut-mount.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules.d/98dracut-systemd/dracut-mount.service b/modules.d/98dracut-systemd/dracut-mount.service
index 77d34f62..c88e6d84 100644
--- a/modules.d/98dracut-systemd/dracut-mount.service
+++ b/modules.d/98dracut-systemd/dracut-mount.service
@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot
Type=oneshot
ExecStart=-/bin/dracut-mount
StandardInput=null
-StandardOutput=syslog
-StandardError=syslog+console
+StandardError=journal+console
KillMode=process
RemainAfterExit=yes

23
0081.patch Normal file
View File

@ -0,0 +1,23 @@
From 0cf01f125a224efd35bfe6ab736d9e04de715264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Wed, 15 Jul 2020 14:36:20 +0000
Subject: [PATCH] As of v246 of systemd "syslog" and "syslog-console" switches
have been deprecated
---
modules.d/99memstrack/memstrack.service | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/99memstrack/memstrack.service b/modules.d/99memstrack/memstrack.service
index 6b47adef..c9fcadef 100644
--- a/modules.d/99memstrack/memstrack.service
+++ b/modules.d/99memstrack/memstrack.service
@@ -9,5 +9,5 @@ Type=simple
ExecStart=/bin/memstrack-start
PIDFile=/run/memstrack.pid
StandardInput=null
-StandardOutput=syslog+console
-StandardError=syslog+console
+StandardOutput=journal+console
+StandardError=journal+console

24
0082.patch Normal file
View File

@ -0,0 +1,24 @@
From f7ad1479f277ddffcc501bd08919a4a4a6facc26 Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Mon, 3 Aug 2020 16:51:54 +0800
Subject: [PATCH] 90kernel-modules: add pci_hyperv
Install pci_hyperv for SR-IOV devices on hyperv machines.
---
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 b3aa75f3..764675eb 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -57,7 +57,7 @@ installkernel() {
instmods \
yenta_socket \
atkbd i8042 usbhid firewire-ohci pcmcia hv-vmbus \
- virtio virtio_ring virtio_pci virtio_scsi \
+ virtio virtio_ring virtio_pci virtio_scsi pci_hyperv \
"=drivers/pcmcia"
if [[ "${DRACUT_ARCH:-$(uname -m)}" == arm* || "${DRACUT_ARCH:-$(uname -m)}" == aarch64 ]]; then

35
0083.patch Normal file
View File

@ -0,0 +1,35 @@
From 05ce5c41b61f97d41044f2f146de980e38f7991a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jul 2020 17:47:00 +0200
Subject: [PATCH] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
---
modules.d/90ppcmac/module-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/90ppcmac/module-setup.sh b/modules.d/90ppcmac/module-setup.sh
index 59221ec4..d457119f 100644
--- a/modules.d/90ppcmac/module-setup.sh
+++ b/modules.d/90ppcmac/module-setup.sh
@@ -17,9 +17,9 @@
# called by dracut
check() {
- local _arch="$(uname -m)"
+ local _arch=${DRACUT_ARCH:-$(uname -m)}
# only for PowerPC Macs
- [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
+ [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
return 0
}
@@ -36,7 +36,7 @@ installkernel() {
}
# only PowerMac3,6 has a module, special case
- if [[ "$(uname -m)" == ppc ]]; then
+ if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
instmods therm_windtunnel
fi

30
0084.patch Normal file
View File

@ -0,0 +1,30 @@
From fa1b98e4eafbc4e4145328b094388328b83bb647 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jul 2020 17:29:23 +0200
Subject: [PATCH] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz for
i686
Previously this would not catch ppc64le, now it does; same with
i686.
---
mkinitrd-dracut.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkinitrd-dracut.sh b/mkinitrd-dracut.sh
index 82d90684..c2141d68 100755
--- a/mkinitrd-dracut.sh
+++ b/mkinitrd-dracut.sh
@@ -57,10 +57,10 @@ default_kernel_images() {
s390|s390x)
regex='image'
;;
- ppc|ppc64)
+ ppc*)
regex='vmlinux'
;;
- i386|x86_64)
+ i?86|x86_64)
regex='vmlinuz'
;;
arm*)

23
0085.patch Normal file
View File

@ -0,0 +1,23 @@
From 63b05a8e6787301dce435bd414a37a8f3ae9cdde Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jul 2020 17:20:40 +0200
Subject: [PATCH] dracut.sh: fix ia32 detection for uefi executables
---
dracut.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.sh b/dracut.sh
index d5dfa77d..8f78da06 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
case $(uname -m) in
x86_64)
EFI_MACHINE_TYPE_NAME=x64;;
- ia32)
+ i?86)
EFI_MACHINE_TYPE_NAME=ia32;;
*)
dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"

249
0086.patch Normal file
View File

@ -0,0 +1,249 @@
From 019610af266bcaef711715266bc0ca4be1044150 Mon Sep 17 00:00:00 2001
From: Enzo Matsumiya <ematsumiya@suse.de>
Date: Mon, 3 Aug 2020 11:21:36 -0300
Subject: [PATCH] 95nvmf: add NVMe over TCP support
Add support to boot from an NVMe over TCP device.
Example of supported command line formats:
nvme.discover=tcp:192.168.1.3::4420
nvme.discover=tcp:192.168.1.3 # will use 4420 as default svcid
- Create is_nvmf() function to handle all fabrics types
- Fix parse_nvmf_discover() to correctly use the default values
- Auxiliary function to validate an IP connection
- Fix inverted result for getargbool when reading "rd.nonvmf" command line parameter
Requires rd.neednet=1
Requires adding/replacing STARTMODE in /etc/sysconfig/network/ifcfg-ethX to "nfsroot"
to avoid shutdown hanging in initiator
Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
---
modules.d/95nvmf/module-setup.sh | 25 ++++---
modules.d/95nvmf/parse-nvmf-boot-connections.sh | 97 ++++++++++++++++++-------
2 files changed, 84 insertions(+), 38 deletions(-)
diff --git a/modules.d/95nvmf/module-setup.sh b/modules.d/95nvmf/module-setup.sh
index db43ec01..418b5e0c 100755
--- a/modules.d/95nvmf/module-setup.sh
+++ b/modules.d/95nvmf/module-setup.sh
@@ -6,9 +6,9 @@ check() {
[ -f /etc/nvme/hostnqn ] || return 255
[ -f /etc/nvme/hostid ] || return 255
- is_nvme_fc() {
+ is_nvmf() {
local _dev=$1
- local traddr
+ local trtype
[[ -L "/sys/dev/block/$_dev" ]] || return 0
cd -P "/sys/dev/block/$_dev" || return 0
@@ -18,19 +18,19 @@ check() {
for d in device/nvme* ; do
[ -L "$d" ] || continue
if readlink "$d" | grep -q nvme-fabrics ; then
- traddr=$(cat "$d"/address)
- break
- fi
- done
- [[ "${traddr#traddr=nn-}" != "$traddr" ]]
+ trtype=$(cat "$d"/transport)
+ break
+ fi
+ done
+ [[ "$trtype" == "fc" ]] || [[ "$trtype" == "tcp" ]] || [[ "$trtype" == "rdma" ]]
}
[[ $hostonly ]] || [[ $mount_needs ]] && {
pushd . >/dev/null
- for_each_host_dev_and_slaves is_nvme_fc
- local _is_nvme_fc=$?
+ for_each_host_dev_and_slaves is_nvmf
+ local _is_nvmf=$?
popd >/dev/null
- [[ $_is_nvme_fc == 0 ]] || return 255
+ [[ $_is_nvmf == 0 ]] || return 255
if [ ! -f /sys/class/fc/fc_udev_device/nvme_discovery ] ; then
if [ ! -f /etc/nvme/discovery.conf ] ; then
echo "No discovery arguments present"
@@ -43,13 +43,14 @@ check() {
# called by dracut
depends() {
- echo bash rootfs-block
+ echo bash rootfs-block network
return 0
}
# called by dracut
installkernel() {
instmods nvme_fc lpfc qla2xxx
+ hostonly="" instmods nvme_tcp nvme_fabrics
}
# called by dracut
@@ -76,6 +77,8 @@ install() {
inst_simple "/etc/nvme/hostnqn"
inst_simple "/etc/nvme/hostid"
+ inst_multiple ip sed
+
inst_multiple nvme
inst_multiple -o \
"$systemdsystemunitdir/nvm*-connect@.service" \
diff --git a/modules.d/95nvmf/parse-nvmf-boot-connections.sh b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
index 0d16b871..61c6dec1 100755
--- a/modules.d/95nvmf/parse-nvmf-boot-connections.sh
+++ b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
@@ -8,69 +8,102 @@
# Examples:
# nvmf.hostnqn=nqn.2014-08.org.nvmexpress:uuid:37303738-3034-584d-5137-333230423843
# nvmf.discover=rdma:192.168.1.3::4420
+# nvme.discover=tcp:192.168.1.3::4420
+# nvme.discover=tcp:192.168.1.3
# nvmf.discover=fc:auto
#
# Note: FC does autodiscovery, so typically there is no need to
# specify any discover parameters for FC.
#
+type is_ip >/dev/null 2>&1 || . /lib/net-lib.sh
+
+if getargbool 0 rd.nonvmf ; then
+ warn "rd.nonvmf=0: skipping nvmf"
+ return 0
+fi
+
+initqueue --onetime modprobe --all -b -q nvme nvme_tcp nvme_core nvme_fabrics
+
+traddr="none"
+trtype="none"
+hosttraddr="none"
+trsvcid=4420
+
+validate_ip_conn() {
+ if ! getargbool 0 rd.neednet ; then
+ warn "$trtype transport requires rd.neednet=1"
+ return 1
+ fi
+
+ local_address=$(ip -o route get to $traddr | sed -n 's/.*src \([0-9a-f.:]*\).*/\1/p')
+
+ # confirm we got a local IP address
+ if ! is_ip "$local_address" ; then
+ warn "$traddr is an invalid address";
+ return 1
+ fi
+
+ ifname=$(ip -o route get to $local_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
+
+ if ip l show "$ifname" >/dev/null 2>&1 ; then
+ warn "invalid network interface $ifname"
+ return 1
+ fi
+
+ # confirm there's a route to destination
+ if ip route get "$traddr" >/dev/null 2>&1 ; then
+ warn "no route to $traddr"
+ return 1
+ fi
+}
+
parse_nvmf_discover() {
OLDIFS="$IFS"
IFS=:
- trtype="none"
- traddr="none"
- hosttraddr="none"
- trsvcid=4420
-
set $1
IFS="$OLDIFS"
case $# in
2)
- trtype=$1
- traddr=$2
+ [ -n "$1" ] && trtype=$1
+ [ -n "$2" ] && traddr=$2
;;
3)
- trtype=$1
- traddr=$2
- hosttraddr=$3
+ [ -n "$1" ] && trtype=$1
+ [ -n "$2" ] && traddr=$2
+ [ -n "$3" ] && hosttraddr=$3
;;
4)
- trtype=$1
- traddr=$2
- hosttraddr=$3
- trsvcid=$4
+ [ -n "$1" ] && trtype=$1
+ [ -n "$2" ] && traddr=$2
+ [ -n "$3" ] && hosttraddr=$3
+ [ -n "$4" ] && trsvcid=$4
;;
*)
warn "Invalid arguments for nvmf.discover=$1"
return 1
;;
esac
- if [ -z "$traddr" ] ; then
+ if [ "$traddr" = "none" ] ; then
warn "traddr is mandatory for $trtype"
return 1;
fi
- [ -z "$hosttraddr" ] && hosttraddr="none"
- [ -z "$trsvcid" ] && trsvcid="none"
if [ "$trtype" = "fc" ] ; then
- if [ -z "$hosttraddr" ] ; then
+ if [ "$hosttraddr" = "none" ] ; then
warn "host traddr is mandatory for fc"
return 1
fi
elif [ "$trtype" != "rdma" ] && [ "$trtype" != "tcp" ] ; then
warn "unsupported transport $trtype"
return 1
- elif [ -z "$trsvcid" ] ; then
- trsvcid=4420
+ fi
+ if [ "$trtype" = "tcp" ]; then
+ validate_ip_conn
fi
echo "--transport=$trtype --traddr=$traddr --host-traddr=$hosttraddr --trsvcid=$trsvcid" >> /etc/nvme/discovery.conf
}
-if ! getargbool 0 rd.nonvmf ; then
- info "rd.nonvmf=0: skipping nvmf"
- return 0
-fi
-
nvmf_hostnqn=$(getarg nvmf.hostnqn=)
if [ -n "$nvmf_hostnqn" ] ; then
echo "$nvmf_hostnqn" > /etc/nvme/hostnqn
@@ -89,7 +122,17 @@ done
[ -f "/etc/nvme/hostid" ] || exit 0
if [ -f "/etc/nvme/discovery.conf" ] ; then
- /sbin/initqueue --onetime --unique --name nvme-discover /usr/sbin/nvme connect-all
+ if [ "$trtype" = "tcp" ] ; then
+ /sbin/initqueue --settled --onetime --unique --name nvme-discover /usr/sbin/nvme connect-all
+ > /tmp/net.$ifname.did-setup
+ else
+ /sbin/initqueue --onetime --unique --name nvme-discover /usr/sbin/nvme connect-all
+ fi
else
- /sbin/initqueue --finished --unique --name nvme-fc-autoconnect echo 1 > /sys/class/fc/fc_udev_device/nvme_discovery
+ if [ "$trtype" = "tcp" ] ; then
+ /sbin/initqueue --settled --onetime --unique /usr/sbin/nvme connect-all -t tcp -a $traddr -s $trsvcid
+ > /tmp/net.$ifname.did-setup
+ else
+ /sbin/initqueue --finished --unique --name nvme-fc-autoconnect echo 1 > /sys/class/fc/fc_udev_device/nvme_discovery
+ fi
fi

140
0087.patch Normal file
View File

@ -0,0 +1,140 @@
From ceca74ccc397795db68ca6ffbe49d65af2178a50 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.de>
Date: Sat, 11 Jul 2020 00:15:34 +0200
Subject: [PATCH] dracut-functions: add ip_params_for_remote_addr() helper
This helper function takes a remote IP address, and tries to
determine the dracut command line arguments ip= and ifname= that
will make this remote address reachable during boot.
Functionality was taken from the module-setup.sh scripts of 95iscsi and 95nfs,
cleaned up and fixed some issues in particular with statically configured
networks, where the old code would print the unsupported string
"$ifname:static".
---
dracut-functions.sh | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 114 insertions(+)
diff --git a/dracut-functions.sh b/dracut-functions.sh
index b5c28248..07ae88c0 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -728,3 +728,117 @@ btrfs_devs() {
printf -- "%s\n" "$_dev"
done
}
+
+iface_for_remote_addr() {
+ set -- $(ip -o route get to "$1")
+ echo $3
+}
+
+local_addr_for_remote_addr() {
+ set -- $(ip -o route get to "$1")
+ echo $5
+}
+
+peer_for_addr() {
+ local addr=$1
+ local qtd
+
+ # quote periods in IPv4 address
+ qtd=${addr//./\\.}
+ ip -o addr show | \
+ sed -n 's%^.* '"$qtd"' peer \([0-9a-f.:]\{1,\}\(/[0-9]*\)\?\).*$%\1%p'
+}
+
+netmask_for_addr() {
+ local addr=$1
+ local qtd
+
+ # quote periods in IPv4 address
+ qtd=${addr//./\\.}
+ ip -o addr show | sed -n 's,^.* '"$qtd"'/\([0-9]*\) .*$,\1,p'
+}
+
+gateway_for_iface() {
+ local ifname=$1 addr=$2
+
+ case $addr in
+ *.*) proto=4;;
+ *:*) proto=6;;
+ *) return;;
+ esac
+ ip -o -$proto route show | \
+ sed -n "s/^default via \([0-9a-z.:]\{1,\}\) dev $ifname .*\$/\1/p"
+}
+
+# This works only for ifcfg-style network configuration!
+bootproto_for_iface() {
+ local ifname=$1
+ local dir
+
+ # follow ifcfg settings for boot protocol
+ for dir in network-scripts network; do
+ [ -f "/etc/sysconfig/$dir/ifcfg-$ifname" ] && {
+ sed -n "s/BOOTPROTO=[\"']\?\([[:alnum:]]\{1,\}\)[\"']\?.*\$/\1/p" \
+ "/etc/sysconfig/$dir/ifcfg-$ifname"
+ return
+ }
+ done
+}
+
+is_unbracketed_ipv6_address() {
+ strglob "$1" '*:*' && ! strglob "$1" '\[*:*\]'
+}
+
+# Create an ip= string to set up networking such that the given
+# remote address can be reached
+ip_params_for_remote_addr() {
+ local remote_addr=$1
+ local ifname local_addr peer netmask= gateway ifmac
+
+ [[ $remote_addr ]] || return 1
+ ifname=$(iface_for_remote_addr "$remote_addr")
+ [[ $ifname ]] || {
+ berror "failed to determine interface to connect to $remote_addr"
+ return 1
+ }
+
+ # ifname clause to bind the interface name to a MAC address
+ if [ -d "/sys/class/net/$ifname/bonding" ]; then
+ dinfo "Found bonded interface '${ifname}'. Make sure to provide an appropriate 'bond=' cmdline."
+ elif [ -e "/sys/class/net/$ifname/address" ] ; then
+ ifmac=$(cat "/sys/class/net/$ifname/address")
+ [[ $ifmac ]] && printf 'ifname=%s:%s ' "${ifname}" "${ifmac}"
+ fi
+
+ bootproto=$(bootproto_for_iface "$ifname")
+ case $bootproto in
+ dhcp|dhcp6|auto6) ;;
+ dhcp4)
+ bootproto=dhcp;;
+ static*|"")
+ bootproto=;;
+ *)
+ derror "bootproto \"$bootproto\" is unsupported by dracut, trying static configuration"
+ bootproto=;;
+ esac
+ if [[ $bootproto ]]; then
+ printf 'ip=%s:%s ' "${ifname}" "${bootproto}"
+ else
+ local_addr=$(local_addr_for_remote_addr "$remote_addr")
+ [[ $local_addr ]] || {
+ berror "failed to determine local address to connect to $remote_addr"
+ return 1
+ }
+ peer=$(peer_for_addr "$local_addr")
+ # Set peer or netmask, but not both
+ [[ $peer ]] || netmask=$(netmask_for_addr "$local_addr")
+ gateway=$(gateway_for_iface "$ifname" "$local_addr")
+ # Quote IPv6 addresses with brackets
+ is_unbracketed_ipv6_address "$local_addr" && local_addr="[$local_addr]"
+ is_unbracketed_ipv6_address "$peer" && peer="[$peer]"
+ is_unbracketed_ipv6_address "$gateway" && gateway="[$gateway]"
+ printf 'ip=%s:%s:%s:%s::%s:none ' \
+ "${local_addr}" "${peer}" "${gateway}" "${netmask}" "${ifname}"
+ fi
+
+}

44
0088.patch Normal file
View File

@ -0,0 +1,44 @@
From 6dbae7e77238dd44bedb0ca2478f985f451c05bf Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.de>
Date: Fri, 10 Jul 2020 18:09:05 +0200
Subject: [PATCH] 95iscsi: use ip_params_for_remote_addr()
Use the new helper function.
---
modules.d/95iscsi/module-setup.sh | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index 8b6300d5..dfacd797 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -120,27 +120,7 @@ install_iscsiroot() {
done
[ -z "$iscsi_address" ] && return
- local_address=$(ip -o route get to $iscsi_address | sed -n 's/.*src \([0-9a-f.:]*\).*/\1/p')
- ifname=$(ip -o route get to $iscsi_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
-
- # follow ifcfg settings for boot protocol
- for _path in \
- "/etc/sysconfig/network-scripts/ifcfg-$ifname" \
- "/etc/sysconfig/network/ifcfg-$ifname" \
- ; do
- [ -f "$_path" ] && bootproto=$(sed -n "s/BOOTPROTO='\?\([[:alpha:]]*6\?\)4\?/\1/p" "$_path")
- done
-
- if [ $bootproto ]; then
- printf 'ip=%s:%s ' ${ifname} ${bootproto}
- else
- printf 'ip=%s:static ' ${ifname}
- fi
-
- if [ -e /sys/class/net/$ifname/address ] ; then
- ifmac=$(cat /sys/class/net/$ifname/address)
- printf 'ifname=%s:%s ' ${ifname} ${ifmac}
- fi
+ ip_params_for_remote_addr "$iscsi_address"
if [ -n "$iscsi_address" -a -n "$iscsi_targetname" ] ; then
if [ -n "$iscsi_port" -a "$iscsi_port" -eq 3260 ] ; then

47
0089.patch Normal file
View File

@ -0,0 +1,47 @@
From 880d155967bb54f61e5960347aa8bbab6da8f86d Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.de>
Date: Sat, 11 Jul 2020 00:19:09 +0200
Subject: [PATCH] 95nfs: use ip_params_for_remote_addr()
Use the new helper function.
---
modules.d/95nfs/module-setup.sh | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
index d9a91fdf..4a8e140b 100755
--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -47,7 +47,6 @@ cmdline() {
local nfs_root
local nfs_address
local lookup
- local ifname
### nfsroot= ###
nfs_device=$(findmnt -t nfs4 -n -o SOURCE /)
@@ -69,21 +68,9 @@ cmdline() {
lookup=$(host "${nfs_device%%:*}"| grep " address " | head -n1)
nfs_address=${lookup##* }
fi
- ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
- if [ -d /sys/class/net/$ifname/bonding ]; then
- dinfo "Found bonded interface '${ifname}'. Make sure to provide an appropriate 'bond=' cmdline."
- return
- elif [ -e /sys/class/net/$ifname/address ] ; then
- ifmac=$(cat /sys/class/net/$ifname/address)
- printf 'ifname=%s:%s ' ${ifname} ${ifmac}
- fi
- bootproto=$(sed -n "/BOOTPROTO/s/BOOTPROTO='\([[:alpha:]]*6\?\)4\?'/\1/p" /etc/sysconfig/network/ifcfg-$ifname)
- if [ $bootproto ]; then
- printf 'ip=%s:%s ' ${ifname} ${bootproto}
- else
- printf 'ip=%s:static ' ${ifname}
- fi
+ [[ $nfs_address ]] || return
+ ip_params_for_remote_addr "$nfs_address"
}
# called by dracut

25
0090.patch Normal file
View File

@ -0,0 +1,25 @@
From fe02bc78accf4aaa39ab33adcdb5aaa71df90b30 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Sat, 23 May 2020 21:42:18 +0300
Subject: [PATCH] lvm: remove unnecessary ${initdir} from lvm_scan.sh
lvm_scan.sh runs in the initramfs, so paths should not be prefixed with
${initdir}.
---
modules.d/90lvm/lvm_scan.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
index 61a18b24..ff8e66e2 100755
--- a/modules.d/90lvm/lvm_scan.sh
+++ b/modules.d/90lvm/lvm_scan.sh
@@ -91,7 +91,7 @@ export LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
if [ -n "$SNAPSHOT" ] ; then
# HACK - this should probably be done elsewhere or turned into a function
# Enable read-write LVM locking
- sed -i -e 's/\(^[[:space:]]*\)locking_type[[:space:]]*=[[:space:]]*[[:digit:]]/\1locking_type = 1/' ${initdir}/etc/lvm/lvm.conf
+ sed -i -e 's/\(^[[:space:]]*\)locking_type[[:space:]]*=[[:space:]]*[[:digit:]]/\1locking_type = 1/' /etc/lvm/lvm.conf
# Expected SNAPSHOT format "<orig lv name>:<snap lv name>"
ORIG_LV=${SNAPSHOT%%:*}

150
0091.patch Normal file
View File

@ -0,0 +1,150 @@
From 480aa9695f8c2e2b30c8f41ae8483140020d23db Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Tue, 4 Aug 2020 10:20:51 +0200
Subject: [PATCH] 95resume: Do not resume on iSCSI, FCoE or NBD
The iSCSI configuration is started after dracut checks for resume,
so we run into a timeout here. Additionally it's questionable if
resume on iSCSI makes sense (or is even supported on the platform).
Same holds true for Network Block Devices and FcOE, cover those as well
References: bsc#999663
Original-patch-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Daniel Molkentin <daniel.molkentin@suse.com>
---
dracut-functions.sh | 44 ++++++++++++++++++++++++++++++++++++++
modules.d/95iscsi/module-setup.sh | 14 ++----------
modules.d/95nbd/module-setup.sh | 4 +---
modules.d/95resume/module-setup.sh | 11 +++++++++-
4 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/dracut-functions.sh b/dracut-functions.sh
index 07ae88c0..e0ca7574 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -842,3 +842,47 @@ ip_params_for_remote_addr() {
fi
}
+
+# block_is_nbd <maj:min>
+# Check whether $1 is an nbd device
+block_is_nbd() {
+ [[ -b /dev/block/$1 && $1 == 43:* ]]
+}
+
+# block_is_iscsi <maj:min>
+# Check whether $1 is an nbd device
+block_is_iscsi() {
+ local _dir
+ local _dev=$1
+ [[ -L "/sys/dev/block/$_dev" ]] || return
+ _dir="$(readlink -f "/sys/dev/block/$_dev")" || return
+ until [[ -d "$_dir/sys" || -d "$_dir/iscsi_session" ]]; do
+ _dir="$_dir/.."
+ done
+ [[ -d "$_dir/iscsi_session" ]]
+}
+
+# block_is_fcoe <maj:min>
+# Check whether $1 is an FCoE device
+# Will not work for HBAs that hide the ethernet aspect
+# completely and present a pure FC device
+block_is_fcoe() {
+ local _dir
+ local _dev=$1
+ [[ -L "/sys/dev/block/$_dev" ]] || return
+ _dir="$(readlink -f "/sys/dev/block/$_dev")"
+ until [[ -d "$_dir/sys" ]]; do
+ _dir="$_dir/.."
+ if [[ -d "$_dir/subsystem" ]]; then
+ subsystem=$(basename $(readlink $_dir/subsystem))
+ [[ $subsystem == "fcoe" ]] && return 0
+ fi
+ done
+ return 1
+}
+
+# block_is_netdevice <maj:min>
+# Check whether $1 is a net device
+block_is_netdevice() {
+ block_is_nbd "$1" || block_is_iscsi "$1" || block_is_fcoe "$1"
+}
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index dfacd797..20922442 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -9,20 +9,9 @@ check() {
# If hostonly was requested, fail the check if we are not actually
# booting from root.
- is_iscsi() {
- local _dev=$1
-
- [[ -L "/sys/dev/block/$_dev" ]] || return
- cd "$(readlink -f "/sys/dev/block/$_dev")"
- until [[ -d sys || -d iscsi_session ]]; do
- cd ..
- done
- [[ -d iscsi_session ]]
- }
-
[[ $hostonly ]] || [[ $mount_needs ]] && {
pushd . >/dev/null
- for_each_host_dev_and_slaves is_iscsi
+ for_each_host_dev_and_slaves block_is_iscsi
local _is_iscsi=$?
popd >/dev/null
[[ $_is_iscsi == 0 ]] || return 255
@@ -223,6 +212,7 @@ install() {
inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
+
if ! dracut_module_included "systemd"; then
inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
else
diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh
index 22f6a3bf..9254b49a 100755
--- a/modules.d/95nbd/module-setup.sh
+++ b/modules.d/95nbd/module-setup.sh
@@ -7,11 +7,9 @@ check() {
# if an nbd device is not somewhere in the chain of devices root is
# mounted on, fail the hostonly check.
[[ $hostonly ]] || [[ $mount_needs ]] && {
- is_nbd() { [[ -b /dev/block/$1 && $1 == 43:* ]] ;}
-
_rootdev=$(find_root_block_device)
[[ -b /dev/block/$_rootdev ]] || return 1
- check_block_and_slaves is_nbd "$_rootdev" || return 255
+ check_block_and_slaves block_is_nbd "$_rootdev" || return 255
}
require_binaries nbd-client || return 1
diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
index cb06b567..96c2573e 100755
--- a/modules.d/95resume/module-setup.sh
+++ b/modules.d/95resume/module-setup.sh
@@ -2,9 +2,18 @@
# called by dracut
check() {
+ swap_on_netdevice() {
+ local _dev
+ for _dev in "${swap_devs[@]}"; do
+ block_is_netdevice $_dev && return 0
+ done
+ return 1
+ }
+
# Only support resume if hibernation is currently on
+ # and no swap is mounted on a net device
[[ $hostonly ]] || [[ $mount_needs ]] && {
- [[ "$(cat /sys/power/resume)" == "0:0" ]] && return 255
+ swap_on_netdevice || [[ "$(cat /sys/power/resume)" == "0:0" ]] && return 255
}
return 0

23
0092.patch Normal file
View File

@ -0,0 +1,23 @@
From e90220701445dc58c56c3df22276cbc9b1299dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Tue, 24 Sep 2019 22:39:43 -0400
Subject: [PATCH] dracut.modules.7.asc: fix another typo
---
dracut.modules.7.asc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.modules.7.asc b/dracut.modules.7.asc
index 67a56bd4..fb30409e 100644
--- a/dracut.modules.7.asc
+++ b/dracut.modules.7.asc
@@ -159,7 +159,7 @@ check():
return 0
----
-The we create the install() function, which installs a cmdline hook with
+Then we create the install() function, which installs a cmdline hook with
priority number 20 called _parse-insmodpost.sh_. It also installs the
_insmodpost.sh_ script in _/sbin_.

27
0093.patch Normal file
View File

@ -0,0 +1,27 @@
From 30ea52f88cddd99825b6bb9be79b738702cb1a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Tue, 24 Sep 2019 23:00:35 -0400
Subject: [PATCH] dracut.modules.7.asc: fix reference to insmodpost module
The module 96insmodpost was renamed to 90kernel-modules since commit
5078c98a (move insmodpost and blacklisting to 90kernel-modules)
---
dracut.modules.7.asc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dracut.modules.7.asc b/dracut.modules.7.asc
index fb30409e..81135cff 100644
--- a/dracut.modules.7.asc
+++ b/dracut.modules.7.asc
@@ -146,8 +146,8 @@ FIXME
== Writing a Module
-A simple example module is _96insmodpost_, which modprobes a kernel module after
-udev has settled and the basic device drivers have been loaded.
+A simple example module is _90kernel-modules_, which modprobes a kernel module
+after udev has settled and the basic device drivers have been loaded.
All module installation information is in the file module-setup.sh.

24
0094.patch Normal file
View File

@ -0,0 +1,24 @@
From 07417b7fc5cb261187519c916e4735189f20f4c6 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Sat, 23 May 2020 18:03:47 +0300
Subject: [PATCH] lvm: fix removal of pvscan from udev rules
udev rules provided by lvm 2.02.128 and newer uses '+=' instead of '='.
---
modules.d/90lvm/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
index d6d2c185..52c803f7 100755
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -101,7 +101,7 @@ install() {
sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' \
${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
- sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
+ sed -i -e 's/^ENV{SYSTEMD_WANTS}+\?=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
else
sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' \
${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

29
0095.patch Normal file
View File

@ -0,0 +1,29 @@
From 5c025a7d2a53cd63c7a94269aec2887e016ba2d6 Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Wed, 10 Jun 2020 18:28:27 +0800
Subject: [PATCH] 99memstrack: Only start tracking service when rd.memdebug=4|5
Currently systemd will always start the tracking service, it will
exit early if rd.memdebug<=3 so there is no issue here, but it
leave a message of: "Started Memstrack Anylazing Service.".
Better to avoid such message if it's not used.
Signed-off-by: Kairui Song <kasong@redhat.com>
---
modules.d/99memstrack/memstrack.service | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modules.d/99memstrack/memstrack.service b/modules.d/99memstrack/memstrack.service
index c9fcadef..fce373b5 100644
--- a/modules.d/99memstrack/memstrack.service
+++ b/modules.d/99memstrack/memstrack.service
@@ -3,6 +3,8 @@ Description=Memstrack Anylazing Service
DefaultDependencies=no
Before=dracut-cmdline.service systemd-udevd.service local-fs-pre.target
IgnoreOnIsolate=true
+ConditionKernelCommandLine=|rd.memdebug=4
+ConditionKernelCommandLine=|rd.memdebug=5
[Service]
Type=simple

35
0096.patch Normal file
View File

@ -0,0 +1,35 @@
From acc782bad5c77a8e105c9c5a8fc8873bc2ff06ec Mon Sep 17 00:00:00 2001
From: Norbert Lange <norbert.lange@andritz.com>
Date: Mon, 6 Jul 2020 18:16:13 +0200
Subject: [PATCH] mount-root.sh: fix writing fstab file with missing fsck flag
if the kernel argument rootflags is set, then dracut will
not parse the rootfs fstab and rootfsck wil not be set.
if the filesystem can be fsck'ed then its unmounted,
and an entry to the local fstab is written, omitting the last
field.
mounting /sysroot using fstab will then fail.
This change makes sure that the filed is always written.
Signed-off-by: Norbert Lange <norbert.lange@andritz.com>
---
modules.d/95rootfs-block/mount-root.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index 0eddbcd5..6503b517 100755
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -116,7 +116,7 @@ mount_root() {
ran_fsck=1
fi
- echo "${root#block:} $NEWROOT $rootfs ${rflags:-defaults} 0 $rootfsck" >> /etc/fstab
+ echo "${root#block:} $NEWROOT $rootfs ${rflags:-defaults} 0 ${rootfsck:-0}" >> /etc/fstab
if ! ismounted "$NEWROOT"; then
info "Mounting ${root#block:} with -o ${rflags}"

51
0097.patch Normal file
View File

@ -0,0 +1,51 @@
From dc9596155def879c99caa03acc5bd6d7090488ed Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Fri, 2 Aug 2019 17:11:19 +0800
Subject: [PATCH] dracut-initqueue: Print more useful info in case of timeout
Currently when initqueue timeout, it span the console with
"dracut-initqueue timeout - starting timeout scripts", which isn't very
helpful as we still don't know what actually happened. Try to improve
this by print what is actually being waited.
Besides, only print "starting timeout scripts" when there are
actual timeout scripts to use.
Signed-off-by: Kairui Song <kasong@redhat.com>
---
modules.d/98dracut-systemd/dracut-initqueue.sh | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/modules.d/98dracut-systemd/dracut-initqueue.sh b/modules.d/98dracut-systemd/dracut-initqueue.sh
index 3ddc2362..89225995 100755
--- a/modules.d/98dracut-systemd/dracut-initqueue.sh
+++ b/modules.d/98dracut-systemd/dracut-initqueue.sh
@@ -55,14 +55,20 @@ while :; do
done
if [ $main_loop -gt $((2*$RDRETRY/3)) ]; then
- warn "dracut-initqueue timeout - starting timeout scripts"
- for job in $hookdir/initqueue/timeout/*.sh; do
- [ -e "$job" ] || break
- job=$job . $job
- udevadm settle --timeout=0 >/dev/null 2>&1 || main_loop=0
- [ -f $hookdir/initqueue/work ] && main_loop=0
- [ $main_loop -eq 0 ] && break
+ warn "dracut-initqueue: timeout, still waiting for following initqueue hooks:"
+ for _f in $hookdir/initqueue/finished/*.sh; do
+ warn "$_f: \"$(cat "$_f")\""
done
+ if [ "$(ls -A $hookdir/initqueue/finished)" ]; then
+ warn "dracut-initqueue: starting timeout scripts"
+ for job in $hookdir/initqueue/timeout/*.sh; do
+ [ -e "$job" ] || break
+ job=$job . $job
+ udevadm settle --timeout=0 >/dev/null 2>&1 || main_loop=0
+ [ -f $hookdir/initqueue/work ] && main_loop=0
+ [ $main_loop -eq 0 ] && break
+ done
+ fi
fi
main_loop=$(($main_loop+1))

33
0098.patch Normal file
View File

@ -0,0 +1,33 @@
From 3a2beb037c822e1567f86b63ac24194bffeea991 Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Mon, 8 Jun 2020 15:31:56 +0800
Subject: [PATCH] 99squash: Don't hardcode the squash sub directories
Signed-off-by: Kairui Song <kasong@redhat.com>
---
modules.d/99squash/setup-squash.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/99squash/setup-squash.sh b/modules.d/99squash/setup-squash.sh
index d2740e7c..d0000b6f 100755
--- a/modules.d/99squash/setup-squash.sh
+++ b/modules.d/99squash/setup-squash.sh
@@ -4,7 +4,6 @@ PATH=/bin:/sbin
SQUASH_IMG=/squash/root.img
SQUASH_MNT=/squash/root
SQUASH_MNT_REC=/squash/mounts
-SQUASHED_MNT="usr etc"
echo $SQUASH_MNT > $SQUASH_MNT_REC
@@ -45,7 +44,8 @@ if [ $? != 0 ]; then
echo "Unable to mount squashed initramfs image"
fi
-for file in $SQUASHED_MNT; do
+for file in $SQUASH_MNT/*; do
+ file=${file#$SQUASH_MNT/}
lowerdir=$SQUASH_MNT/$file
workdir=/squash/overlay-work/$file
upperdir=/$file

53
0099.patch Normal file
View File

@ -0,0 +1,53 @@
From cfd872392c59c96665c558899880d6b2980065bb Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Mon, 8 Jun 2020 17:00:00 +0800
Subject: [PATCH] 99squash: improve pre-requirements check
Check for systemd-initrd and squashfs-tools in check() to fail early if
it won't work.
Signed-off-by: Kairui Song <kasong@redhat.com>
---
modules.d/99squash/module-setup.sh | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/modules.d/99squash/module-setup.sh b/modules.d/99squash/module-setup.sh
index 72fa81f0..6307377c 100644
--- a/modules.d/99squash/module-setup.sh
+++ b/modules.d/99squash/module-setup.sh
@@ -1,11 +1,21 @@
#!/bin/bash
check() {
+ if ! dracut_module_included "systemd-initrd"; then
+ derror "dracut-squash only supports systemd bases initramfs"
+ return 1
+ fi
+
+ if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then
+ derror "dracut-squash module requires squashfs-tools"
+ return 1
+ fi
+
return 255
}
depends() {
- echo "bash systemd systemd-initrd"
+ echo "bash systemd-initrd"
return 0
}
@@ -14,11 +24,6 @@ installkernel() {
}
install() {
- if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then
- derror "squash module requires squashfs-tools to be installed."
- return 1
- fi
-
inst_multiple kmod modprobe mount mkdir ln echo
inst $moddir/setup-squash.sh /squash/setup-squash.sh
inst $moddir/clear-squash.sh /squash/clear-squash.sh

138
0100.patch Normal file
View File

@ -0,0 +1,138 @@
From 4159819fbb20fca8c0a80ddb17e211f481ec7717 Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Tue, 9 Jun 2020 00:41:24 +0800
Subject: [PATCH] 99squash: simplify the code
The new dracutsysrootdir could be used to replace the shell function
required_in_root, so drop it and also simplify the code.
Signed-off-by: Kairui Song <kasong@redhat.com>
---
dracut.sh | 89 ++++++++++++++-------------------------------------------------
1 file changed, 20 insertions(+), 69 deletions(-)
diff --git a/dracut.sh b/dracut.sh
index 8f78da06..12f75670 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1833,23 +1833,19 @@ fi
if dracut_module_included "squash"; then
dinfo "*** Install squash loader ***"
- if ! check_kernel_config CONFIG_SQUASHFS; then
- dfatal "CONFIG_SQUASHFS have to be enabled for dracut squash module to work"
- exit 1
- fi
- if ! check_kernel_config CONFIG_OVERLAY_FS; then
- dfatal "CONFIG_OVERLAY_FS have to be enabled for dracut squash module to work"
- exit 1
- fi
- if ! check_kernel_config CONFIG_DEVTMPFS; then
- dfatal "CONFIG_DEVTMPFS have to be enabled for dracut squash module to work"
+ for config in \
+ CONFIG_SQUASHFS \
+ CONFIG_OVERLAY_FS \
+ CONFIG_DEVTMPFS;
+ do
+ if ! check_kernel_config $config; then
+ dfatal "$config have to be enabled for dracut squash module to work"
exit 1
- fi
+ fi
+ done
readonly squash_dir="$initdir/squash/root"
- readonly squash_img=$initdir/squash/root.img
-
- # Currently only move "usr" "etc" to squashdir
+ readonly squash_img="$initdir/squash/root.img"
readonly squash_candidate=( "usr" "etc" )
mkdir -m 0755 -p $squash_dir
@@ -1860,57 +1856,15 @@ if dracut_module_included "squash"; then
# Move some files out side of the squash image, including:
# - Files required to boot and mount the squashfs image
# - Files need to be accessible without mounting the squash image
- required_in_root() {
- local file=$1
- local _sqsh_file=$squash_dir/$file
- local _init_file=$initdir/$file
-
- if [[ -e $_init_file ]]; then
- return
- fi
-
- if [[ ! -e $_sqsh_file ]] && [[ ! -L $_sqsh_file ]]; then
- derror "$file is required to boot a squashed initramfs but it's not installed!"
- return
- fi
-
- if [[ ! -d $(dirname $_init_file) ]]; then
- required_in_root $(dirname $file)
- fi
-
- if [[ -L $_sqsh_file ]]; then
- cp --preserve=all -P $_sqsh_file $_init_file
- _sqsh_file=$(realpath $_sqsh_file 2>/dev/null)
- if [[ -e $_sqsh_file ]] && [[ "$_sqsh_file" == "$squash_dir"* ]]; then
- # Relative symlink
- required_in_root ${_sqsh_file#$squash_dir/}
- return
- fi
- if [[ -e $squash_dir$_sqsh_file ]]; then
- # Absolute symlink
- required_in_root ${_sqsh_file#/}
- return
- fi
- required_in_root ${module_spec#$squash_dir/}
- else
- if [[ -d $_sqsh_file ]]; then
- mkdir $_init_file
- else
- mv $_sqsh_file $_init_file
- fi
- fi
- }
-
- required_in_root etc/initrd-release
-
- for module_spec in $squash_dir/usr/lib/modules/*/modules.*;
- do
- required_in_root ${module_spec#$squash_dir/}
- done
-
- for dracut_spec in $squash_dir/usr/lib/dracut/*;
+ # - Initramfs marker
+ for file in \
+ $squash_dir/usr/lib/modules/*/modules.* \
+ $squash_dir/usr/lib/dracut/* \
+ $squash_dir/etc/initrd-release
do
- required_in_root ${dracut_spec#$squash_dir/}
+ [[ -d $file ]] && continue
+ DRACUT_RESOLVE_DEPS=1 dracutsysrootdir=$squash_dir inst ${file#$squash_dir}
+ rm $file
done
mv $initdir/init $initdir/init.stock
@@ -1921,17 +1875,14 @@ if dracut_module_included "squash"; then
# accessible before mounting the image.
inst_multiple "echo" "sh" "mount" "modprobe" "mkdir"
hostonly="" instmods "loop" "squashfs" "overlay"
-
# Only keep systemctl outsite if we need switch root
if [[ ! -f "$initdir/lib/dracut/no-switch-root" ]]; then
inst "systemctl"
fi
+ # Remove duplicated files
for folder in "${squash_candidate[@]}"; do
- # Remove duplicated files in squashfs image, save some more space
- [[ ! -d $initdir/$folder/ ]] && continue
- for file in $(find $initdir/$folder/ -not -type d);
- do
+ for file in $(find $initdir/$folder/ -not -type d); do
if [[ -e $squash_dir${file#$initdir} ]]; then
mv $squash_dir${file#$initdir} $file
fi

23
0101.patch Normal file
View File

@ -0,0 +1,23 @@
From ae83919a7a07b5c90cae8ce8b1349efc212a7aee Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 4 Aug 2020 14:16:19 +0200
Subject: [PATCH] match the whole string
---
modules.d/95zfcp/parse-zfcp.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/95zfcp/parse-zfcp.sh b/modules.d/95zfcp/parse-zfcp.sh
index 6e1514fd..fb4d9c9e 100755
--- a/modules.d/95zfcp/parse-zfcp.sh
+++ b/modules.d/95zfcp/parse-zfcp.sh
@@ -3,7 +3,7 @@
getargbool 1 rd.zfcp.conf -d -n rd_NO_ZFCPCONF || rm /etc/zfcp.conf
for zfcp_arg in $(getargs rd.zfcp -d 'rd_ZFCP='); do
- echo $zfcp_arg | grep '0\.[0-9a-fA-F]\.[0-9a-fA-F]\{4\},0x[0-9a-fA-F]\{16\},0x[0-9a-fA-F]\{16\}' >/dev/null
+ echo $zfcp_arg | grep '^0\.[0-9a-fA-F]\.[0-9a-fA-F]\{4\},0x[0-9a-fA-F]\{16\},0x[0-9a-fA-F]\{16\}$' >/dev/null
test $? -ne 0 && die "For argument 'rd.zfcp=$zfcp_arg'\nSorry, invalid format."
(
IFS=","

25
0102.patch Normal file
View File

@ -0,0 +1,25 @@
From d9e27b091717a1ce1c58cc911d9d7b5ec3ed901e Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 4 Aug 2020 14:18:54 +0200
Subject: [PATCH] match simplified rd.zfcp format too
The simplified format was introduced by commit
c8aa1d949aecaf146b0a0e1ce269f69e6048dc5a .
---
modules.d/95zfcp/parse-zfcp.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/95zfcp/parse-zfcp.sh b/modules.d/95zfcp/parse-zfcp.sh
index fb4d9c9e..5aa6add8 100755
--- a/modules.d/95zfcp/parse-zfcp.sh
+++ b/modules.d/95zfcp/parse-zfcp.sh
@@ -3,7 +3,7 @@
getargbool 1 rd.zfcp.conf -d -n rd_NO_ZFCPCONF || rm /etc/zfcp.conf
for zfcp_arg in $(getargs rd.zfcp -d 'rd_ZFCP='); do
- echo $zfcp_arg | grep '^0\.[0-9a-fA-F]\.[0-9a-fA-F]\{4\},0x[0-9a-fA-F]\{16\},0x[0-9a-fA-F]\{16\}$' >/dev/null
+ echo $zfcp_arg | grep '^0\.[0-9a-fA-F]\.[0-9a-fA-F]\{4\}\(,0x[0-9a-fA-F]\{16\},0x[0-9a-fA-F]\{16\}\)\?$' >/dev/null
test $? -ne 0 && die "For argument 'rd.zfcp=$zfcp_arg'\nSorry, invalid format."
(
IFS=","

26
0103.patch Normal file
View File

@ -0,0 +1,26 @@
From 09a691af3b63543fe58faa02661f785b907a78a6 Mon Sep 17 00:00:00 2001
From: Denis Volkov <denis@simpletexting.net>
Date: Tue, 4 Aug 2020 19:51:27 +0500
Subject: [PATCH] Change the order of NFS servers during the boot NFS server
provided by DHCP in next-server option has higher priority than DHCP-server
itself
---
modules.d/95nfs/nfs-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh
index 1ba4f5ff..95844f58 100755
--- a/modules.d/95nfs/nfs-lib.sh
+++ b/modules.d/95nfs/nfs-lib.sh
@@ -112,8 +112,8 @@ nfsroot_from_dhcp() {
[ -n "$new_root_path" ] && nfsroot_to_var "$nfs:$new_root_path"
[ -z "$path" ] && [ "$(getarg root=)" = "/dev/nfs" ] && path=/tftpboot/%s
[ -z "$server" ] && server=$srv
- [ -z "$server" ] && server=$new_dhcp_server_identifier
[ -z "$server" ] && server=$new_next_server
+ [ -z "$server" ] && server=$new_dhcp_server_identifier
[ -z "$server" ] && server=${new_root_path%%:*}
}

89
0104.patch Normal file
View File

@ -0,0 +1,89 @@
From 3f5bf54fbffdc3516a08c9329b4be80b06761c7a Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Wed, 22 Jul 2020 09:34:42 +0200
Subject: [PATCH] 35network-legacy: simplify fallback dhcp setup
suppress redundant calls to network setup
combine code for "no ip option directed at our interface" and
"No ip lines default to dhcp"
correct evaluation of return code for creating did-setup files
fix application of "load_ipv6" call to ipv6 setup only
Reference: bsc#1173402
---
modules.d/35network-legacy/ifup.sh | 41 +++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/modules.d/35network-legacy/ifup.sh b/modules.d/35network-legacy/ifup.sh
index c05ccc1b..b1ae52ea 100755
--- a/modules.d/35network-legacy/ifup.sh
+++ b/modules.d/35network-legacy/ifup.sh
@@ -376,23 +376,6 @@ else
fi
-# No ip lines default to dhcp
-ip=$(getarg ip)
-
-if [ -z "$NO_AUTO_DHCP" ] && [ -z "$ip" ]; then
- if [ "$netroot" = "dhcp6" ]; then
- do_dhcp -6
- else
- do_dhcp -4
- fi
-
- for s in $(getargs nameserver); do
- [ -n "$s" ] || continue
- echo nameserver $s >> /tmp/net.$netif.resolv.conf
- done
-fi
-
-
# Specific configuration, spin through the kernel command line
# looking for ip= lines
for p in $(getargs ip=); do
@@ -473,21 +456,39 @@ done
# no ip option directed at our interface?
if [ -z "$NO_AUTO_DHCP" ] && [ ! -e /tmp/net.${netif}.up ]; then
+ ret=1
if [ -e /tmp/net.bootdev ]; then
BOOTDEV=$(cat /tmp/net.bootdev)
if [ "$netif" = "$BOOTDEV" ] || [ "$BOOTDEV" = "$(cat /sys/class/net/${netif}/address)" ]; then
- load_ipv6
do_dhcp
+ ret=$?
fi
else
- if getargs 'ip=dhcp6'; then
+ # No ip lines, no bootdev -> default to dhcp
+ ip=$(getarg ip)
+
+ if getargs 'ip=dhcp6' || [ -z "$ip" -a "$netroot" = "dhcp6" ]; then
load_ipv6
do_dhcp -6
+ ret=$?
fi
- if getargs 'ip=dhcp'; then
+ if getargs 'ip=dhcp' || [ -z "$ip" -a "$netroot" != "dhcp6" ]; then
do_dhcp -4
+ ret=$?
fi
fi
+
+ for s in $(getargs nameserver); do
+ [ -n "$s" ] || continue
+ echo nameserver $s >> /tmp/net.$netif.resolv.conf
+ done
+
+ if [ "$ret" -eq 0 ] && [ -n "$(ls /tmp/leaseinfo.${netif}*)" ]; then
+ > /tmp/net.${netif}.did-setup
+ if [ -e /sys/class/net/${netif}/address ]; then
+ > /tmp/net.$(cat /sys/class/net/${netif}/address).did-setup
+ fi
+ fi
fi
exit 0

56
0105.patch Normal file
View File

@ -0,0 +1,56 @@
From f84ad9e062519c43264f1a512227621b3bf1853b Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Fri, 27 Mar 2020 16:16:07 +0300
Subject: [PATCH] Allow $DRACUT_INSTALL to be not an absolute path
/usr/sbin/dracut-install is a symlink:
$ file /usr/sbin/dracut-install
/usr/sbin/dracut-install: symbolic link to ../lib/dracut/dracut-install
It resulted to "dracut-install not found" error:
+++ for p in $DRACUT_PATH
+++ [[ -L /sbin/dracut-install ]]
+++ [[ -x /sbin/dracut-install ]]
+++ for p in $DRACUT_PATH
+++ [[ -L /bin/dracut-install ]]
+++ [[ -x /bin/dracut-install ]]
+++ for p in $DRACUT_PATH
+++ [[ -L /usr/sbin/dracut-install ]]
+++ printf '%s\n' dracut-install
+++ return 0
++ DRACUT_INSTALL=dracut-install
++ [[ -n dracut-install ]]
++ [[ -n dracut-install ]]
++ DRINSTALLPARTS=0
++ for i in $DRACUT_INSTALL
++ DRINSTALLPARTS=1
++ [[ 1 = 1 ]]
++ [[ -x dracut-install ]]
++ dfatal 'dracut-install not found!'
++ set +x
dracut: dracut-install not found!
[ -x <not a path to file> ] is not correct and will always be false.
But actually it is available. Let's just allow it to be not an absolute path.
Maybe some other places can be improved to avoid DRACUT_INSTALL being not an absolute path.
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
---
dracut-init.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-init.sh b/dracut-init.sh
index a8348b79..837267aa 100644
--- a/dracut-init.sh
+++ b/dracut-init.sh
@@ -183,7 +183,7 @@ for i in $DRACUT_INSTALL ; do
DRINSTALLPARTS=$(($DRINSTALLPARTS+1))
done
-if [[ $DRINSTALLPARTS = 1 ]] && ! [[ -x $DRACUT_INSTALL ]]; then
+if [[ $DRINSTALLPARTS = 1 ]] && ! command -v "$DRACUT_INSTALL" > /dev/null 2>&1 ; then
dfatal "dracut-install not found!"
exit 10
fi

31
0106.patch Normal file
View File

@ -0,0 +1,31 @@
From fea53784adf3748a9f31964272a69b31c152d8cf Mon Sep 17 00:00:00 2001
From: mwberry <mwberry@users.noreply.github.com>
Date: Sat, 30 May 2020 17:55:35 -0700
Subject: [PATCH] UEFI Mode: only write kernel cmdline to UEFI binary
The kernel command line was being written both into
/etc/cmdline.d/01-default.conf and the UEFI executable.
During boot, getcmdline would concatenate these two
resulting in all arguments being duplicated. Some
args, such as ip=, are sensitive to the number of
times they are specified.
---
dracut.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dracut.sh b/dracut.sh
index 12f75670..c439fa02 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1620,7 +1620,9 @@ if [[ $kernel_only != yes ]]; then
(( ${#install_items[@]} > 0 )) && inst_multiple ${install_items[@]}
(( ${#install_optional_items[@]} > 0 )) && inst_multiple -o ${install_optional_items[@]}
- [[ $kernel_cmdline ]] && printf "%s\n" "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"
+ if [[ $kernel_cmdline ]] && [[ $uefi != yes ]]; then
+ printf "%s\n" "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"
+ fi
for line in "${fstab_lines[@]}"; do
line=($line)

24
0107.patch Normal file
View File

@ -0,0 +1,24 @@
From 01b7163a591c3debec794b5f46b52156a16ee934 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Wed, 5 Aug 2020 19:32:35 +0200
Subject: [PATCH] 90lvm: do not add newline to cmdline
Fixes #862
---
modules.d/90lvm/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
index 52c803f7..1eeba79d 100755
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -36,7 +36,7 @@ cmdline() {
eval $(dmsetup splitname --nameprefixes --noheadings --rows "$dev" 2>/dev/null)
[[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
if ! [[ ${_activated[${DM_VG_NAME}/${DM_LV_NAME}]} ]]; then
- printf " rd.lvm.lv=%s\n" "${DM_VG_NAME}/${DM_LV_NAME} "
+ printf " rd.lvm.lv=%s " "${DM_VG_NAME}/${DM_LV_NAME} "
_activated["${DM_VG_NAME}/${DM_LV_NAME}"]=1
fi
done

29
0108.patch Normal file
View File

@ -0,0 +1,29 @@
From 376ce85105121936666349aa5a777768d52516f7 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Fri, 7 Aug 2020 08:39:26 +0200
Subject: [PATCH] net-lib.sh: support infiniband network mac addresses
Infiniband MAC addresses have 20 octets.
Reference: bsc#996146
---
modules.d/40network/net-lib.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index 7f185fdd..556d86b5 100755
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -570,6 +570,11 @@ parse_ifname_opts() {
# udev requires MAC addresses to be lower case
ifname_mac=$(echo $2:$3:$4:$5:$6:$7 | sed 'y/ABCDEF/abcdef/')
;;
+ 21)
+ ifname_if=$1
+ # udev requires MAC addresses to be lower case
+ ifname_mac=$(echo $2:$3:$4:$5:$6:$7:$8:$9:${10}:${11}:${12}:${13}:${14}:${15}:${16}:${17}:${18}:${19}:${20}:${21} | sed 'y/ABCDEF/abcdef/')
+ ;;
*)
die "Invalid arguments for ifname="
;;

34
0109.patch Normal file
View File

@ -0,0 +1,34 @@
From 80f1ce6c1388f498a7fb25c0277039cf66665413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Thu, 6 Aug 2020 19:07:17 +0000
Subject: [PATCH] Adding the labels file for master
---
.github/workflows/master-labels.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/.github/workflows/master-labels.yml b/.github/workflows/master-labels.yml
new file mode 100644
index 00000000..ad4aaa26
--- /dev/null
+++ b/.github/workflows/master-labels.yml
@@ -0,0 +1,18 @@
+# This workflow will triage pull requests for the RHEL-6 branch and
+# apply a label based on the paths that are modified in the pull request.
+
+name: master-labeler
+on:
+ pull_request:
+ branches:
+ - master
+
+jobs:
+ label:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/labeler@v2
+ with:
+ repo-token: "${{ secrets.GITHUB_TOKEN }}"
+ configuration-path: .github/master-label-triggers.yml

34
0110.patch Normal file
View File

@ -0,0 +1,34 @@
From 27047bb5c6988eeb7583661656e8674ea702226e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Thu, 6 Aug 2020 19:10:26 +0000
Subject: [PATCH] Adding the labels file for the RHEL-6 branch
---
.github/workflows/rhel6-labeler.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/.github/workflows/rhel6-labeler.yml b/.github/workflows/rhel6-labeler.yml
new file mode 100644
index 00000000..f342ff2d
--- /dev/null
+++ b/.github/workflows/rhel6-labeler.yml
@@ -0,0 +1,18 @@
+# This workflow will triage pull requests for the RHEL-6 branch and
+# apply a label based on the paths that are modified in the pull request.
+
+name: rhel6-labeler
+on:
+ pull_request:
+ branches:
+ - RHEL-6
+
+jobs:
+ label:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/labeler@v2
+ with:
+ repo-token: "${{ secrets.GITHUB_TOKEN }}"
+ configuration-path: .github/rhel6-label-triggers.yml

34
0111.patch Normal file
View File

@ -0,0 +1,34 @@
From 3b20f5c72e4217f44cbba8dbaf455c6f85d9f1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Thu, 6 Aug 2020 19:10:51 +0000
Subject: [PATCH] Adding the labels file for the RHEL-7 branch
---
.github/workflows/rhel7-labeler.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/.github/workflows/rhel7-labeler.yml b/.github/workflows/rhel7-labeler.yml
new file mode 100644
index 00000000..63f9e1b6
--- /dev/null
+++ b/.github/workflows/rhel7-labeler.yml
@@ -0,0 +1,18 @@
+# This workflow will triage pull requests for the RHEL-7 branch and
+# apply a label based on the paths that are modified in the pull request.
+
+name: rhel7-labeler
+on:
+ pull_request:
+ branches:
+ - RHEL-7
+
+jobs:
+ label:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/labeler@v2
+ with:
+ repo-token: "${{ secrets.GITHUB_TOKEN }}"
+ configuration-path: .github/rhel7-label-triggers.yml

34
0112.patch Normal file
View File

@ -0,0 +1,34 @@
From 4cd8f2c90ef8afb3757ec82d55148b15280e0911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Thu, 6 Aug 2020 19:11:58 +0000
Subject: [PATCH] Adding the labels file for the RHEL-8 branch
---
.github/workflows/rhel8-labeler.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/.github/workflows/rhel8-labeler.yml b/.github/workflows/rhel8-labeler.yml
new file mode 100644
index 00000000..5b83f914
--- /dev/null
+++ b/.github/workflows/rhel8-labeler.yml
@@ -0,0 +1,18 @@
+# This workflow will triage pull requests for the RHEL-9 branch and
+# apply a label based on the paths that are modified in the pull request.
+
+name: rhel8-labeler
+on:
+ pull_request:
+ branches:
+ - RHEL-8
+
+jobs:
+ label:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/labeler@v2
+ with:
+ repo-token: "${{ secrets.GITHUB_TOKEN }}"
+ configuration-path: .github/rhel8-label-triggers.yml

329
0113.patch Normal file
View File

@ -0,0 +1,329 @@
From 76d8b30f4e7ba98102c542f8f520ab027d749efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Thu, 6 Aug 2020 19:13:33 +0000
Subject: [PATCH] Adding the labels trigger file for the Master branch
---
.github/master-label-triggers.yml | 313 ++++++++++++++++++++++++++++++++++++++
1 file changed, 313 insertions(+)
diff --git a/.github/master-label-triggers.yml b/.github/master-label-triggers.yml
new file mode 100644
index 00000000..8c654939
--- /dev/null
+++ b/.github/master-label-triggers.yml
@@ -0,0 +1,313 @@
+# Add 'needs review' label to any pull request
+needs review:
+- "*"
+
+# Add 'repository' label to any root file changes
+repository:
+- ./*
+
+# Add 'github' label to any .github/ file changes
+github:
+- .github/*
+- .github/**/*
+
+# Add 'mkosi' label to any .mkosi/ file changes
+mkosi:
+- .mkosi/*
+- .mkosi/**/*
+- .mkosi/**/**/*
+
+# Add 'dracut install' label to any install/ file changes
+dracut install:
+- install/*
+- install/**/*
+
+# Add 'example' label to any examples/ file changes
+example:
+- examples/*
+- examples/**/*
+- examples/**/**/*
+
+# Add a 'modules' label to any modules.d/ file changes
+modules:
+- modules.d/*
+- modules.d/**/*
+
+# Add a 'bash' label to any bash module changes
+- modules.d/00bash/*
+
+# Add a 'bootchart' label to any bootchart module changes
+- modules.d/00bootchart/*
+
+# Add a 'dash' label to any dash module changes
+- modules.d/00dash/*
+
+# Add a 'mksh' label to any mksh module changes
+- modules.d/00mksh/*
+
+# Add a 'systemd' label to any systemd module changes
+- modules.d/00systemd/*
+
+# Add a 'warpclock' label to any warpclock module changes
+- modules.d/00warpclock/*
+
+# Add a 'fips' label to any fips module changes
+- modules.d/01fips/*
+
+# Add a 'systemd-initrd' label to any systemd-initrd module changes
+- modules.d/01systemd-initrd/*
+
+# Add a 'caps' label to any caps module changes
+- modules.d/02caps/*
+
+# Add a 'systemd-networkd' label to any systemd-networkd module changes
+- modules.d/02systemd-networkd/*
+
+# Add a 'modsign' label to any modsign module changes
+- modules.d/03modsign/*
+
+# Add a 'rescue' label to any rescue module changes
+- modules.d/03rescue/*
+
+# Add a 'watchdog' label to any watchdog module changes
+- modules.d/04watchdog/*
+
+# Add a 'busybox' label to any busybox module changes
+- modules.d/05busybox/*
+
+# Add a 'rngd' label to any rngd module changes
+- modules.d/06rngd/*
+
+# Add a 'i18n' label to any i18n module changes
+- modules.d/10i18n/*
+
+# Add a 'convertfs' label to any convertfs module changes
+- modules.d/30convertfs/*
+
+# Add a 'network-legacy' label to any network-legacy module changes
+- modules.d/35network-legacy/*
+
+# Add a 'network-manager' label to any network-manager module
+- modules.d/35network-manager/*
+
+# Add a 'network' label to any network module changes
+- modules.d/40network/*
+
+# Add a 'ifcfg' label to any ifcfg module changes
+- modules.d/45ifcfg/*
+
+# Add a 'url-lib' label to any url-lib module changes
+- modules.d/45url-lib/*
+
+# Add a 'drm' label to any drm module changes
+- modules.d/50drm/*
+
+# Add a 'gensplash' label to any gensplash module changes
+- modules.d/50gensplash/*
+
+# Add a 'plymouth' label to any plymouth module changes
+- modules.d/50plymouth/*
+
+# Add a 'cms' label to any cms module changes
+- modules.d/80cms/*
+
+# Add a 'lvmmerge' label to any lvmmerge module changes
+- modules.d/80lvmmerge/*
+
+# Add a 'cio_ignore' label to any cio_ignore module changes
+- modules.d/81cio_ignore/*
+
+# Add a 'btrfs' label to any btrfs module changes
+- modules.d/90btrfs/*
+
+# Add a 'crypt' label to any crypt module changes
+- modules.d/90crypt/*
+
+# Add a 'dm' label to any dm module changes
+- modules.d/90dm/*
+
+# Add a 'dmraid' label to any dmraid module changes
+- modules.d/90dmraid/*
+
+# Add a 'dmsquash-live' label to any dmsquash-live module changes
+- modules.d/90dmsquash-live/*
+
+# Add a 'dmsquash-live-ntfs' label to any dmsquash-live-ntfs changes
+- modules.d/90dmsquash-live-ntfs/*
+
+# Add a 'kernel-modules' label to any kernel-modules module changes
+- modules.d/90kernel-modules/*
+
+# Add a 'kernel-modules-extra' label to any kernel-modules-extra changes
+- modules.d/90kernel-modules-extra/*
+
+# Add a 'kernel-network-modules' label to any kernel-network-modules changes
+- modules.d/90kernel-network-modules/*
+
+# Add a 'livenet' label to any livenet module changes
+- modules.d/90livenet/*
+
+# Add a 'lvm' label to any lvm module changes
+- modules.d/90lvm/*
+
+# Add a 'mdraid' label to any mdraid module changes
+- modules.d/90mdraid/*
+
+# Add a 'multipath' label to any multipath module changes
+- modules.d/90multipath/*
+
+# Add a 'nvdimm' label to any nvdimm module changes
+- modules.d/90nvdimm/*
+
+# Add a 'ppcmac' label to any ppcmac module changes
+- modules.d/90ppcmac/*
+
+# Add a 'qemu' label to any qemu module changes
+- modules.d/90qemu/*
+
+# Add a 'qemu-net' label to any qemu-net module changes
+- modules.d/90qemu-net/*
+
+# Add a 'stratis' label to any stratis module changes
+- modules.d/90stratis/*
+
+# Add a 'crypt-gpg' label to any crypt-gpg module changes
+- modules.d/91crypt-gpg/*
+
+# Add a 'crypt-loop' label to any crypt-loop module changes
+- modules.d/91crypt-loop/*
+
+# Add a 'zipl' label to any zipl module changes
+- modules.d/91zipl/*
+
+# Add a 'cifs' label to any cifs module changes
+- modules.d/95cifs/*
+
+# Add a 'dasd' label to any dasd module changes
+- modules.d/95dasd/*
+
+# Add a 'dasd_mod' label to any dasd_mod module changes
+- modules.d/95dasd_mod/*
+
+# Add a 'dasd_rules' label to any dasd_rules module changes
+- modules.d/95dasd_rules/*
+
+# Add a 'dcssblk' label to any dcssblk module changes
+- modules.d/95dcssblk/*
+
+# Add a 'debug' label to any debug module changes
+- modules.d/95debug/*
+
+# Add a 'fcoe' label to any fcoe module changes
+- modules.d/95fcoe/*
+
+# Add a 'fcoe-uefi' label to any fcoe-uefi module changes
+- modules.d/95fcoe-uefi/*
+
+# Add a 'fstab-sys' label to any fstab-sys module changes
+- modules.d/95fstab-sys/*
+
+# Add a 'iscsi' label to any iscsi module changes
+- modules.d/95iscsi/*
+
+# Add a 'lunmask' label to any lunmask module changes
+- modules.d/95lunmask/*
+
+# Add a 'nbd' label to any nbd module changes
+- modules.d/95nbd/*
+
+# Add a 'nfs' label to any nfs module changes
+- modules.d/95nfs/*
+
+# Add a 'nvmf' label to any nvmf module changes
+- modules.d/95nvmf/*
+
+# Add a 'qeth_rules' label to any qeth_rules module changes
+- modules.d/95qeth_rules/*
+
+# Add a 'resume' label to any resume module changes
+- modules.d/95resume/*
+
+# Add a 'rootfs-block' label to any rootfs-block module changes
+- modules.d/95rootfs-block/*
+
+# Add a 'ssh-client' label to any ssh-client module changes
+- modules.d/95ssh-client/*
+
+# Add a 'terminfo' label to any terminfo module changes
+- modules.d/95terminfo/*
+
+# Add a 'udev-rules' label to any udev-rules module changes
+- modules.d/95udev-rules/*
+
+# Add a 'virtfs' label to any virtfs module changes
+- modules.d/95virtfs/*
+
+# Add a 'zfcp' label to any zfcp module changes
+- modules.d/95zfcp/*
+
+# Add a 'zfcp_rules' label to any zfcp_rules module changes
+- modules.d/95zfcp_rules/*
+
+# Add a 'znet' label to any znet module changes
+- modules.d/95znet/*
+
+# Add a 'securityfs' label to any securityfs module changes
+- modules.d/96securityfs/*
+
+# Add a 'biosdevname' label to any biosdevname module changes
+- modules.d/97biosdevname/*
+
+# Add a 'masterkey' label to any masterkey module changes
+- modules.d/97masterkey/*
+
+# Add a 'dracut-systemd' label to any dracut-systemd module changes
+- modules.d/98dracut-systemd/*
+
+# Add a 'ecryptfs' label to any ecryptfs module changes
+- modules.d/98ecryptfs/*
+
+# Add a 'integrity' label to any integrity module changes
+- modules.d/98integrity/*
+
+# Add a 'pollcdrom' label to any pollcdrom module changes
+- modules.d/98pollcdrom/*
+
+# Add a 'selinux' label to any selinux module changes
+- modules.d/98selinux/*
+
+# Add a 'syslog' label to any syslog module changes
+- modules.d/98syslog/*
+
+# Add a 'usrmount' label to any usrmount module changes
+- modules.d/98usrmount/*
+
+# Add a 'base' label to any base module changes
+- modules.d/99base/*
+
+# Add a 'fs-lib' label to any fs-lib module changes
+- modules.d/99fs-lib/*
+
+# Add a 'img-lib' label to any img-lib module changes
+- modules.d/99img-lib/*
+
+# Add a 'memstrack' label to any memstrack module changes
+- modules.d/99memstrack/*
+
+# Add a 'shutdown' label to any shutdown module changes
+- modules.d/99shutdown/*
+
+# Add a 'squash' label to any squash module changes
+- modules.d/99squash/*
+
+# Add a 'uefi-lib' label to any uefi-lib module changes
+- modules.d/99uefi-lib/*
+
+# Add 'test' label to any test/ file changes
+test:
+- test/*
+- test/**/*
+
+# Add 'dracut' label for anything else
+dracut:
+- any: ['!.github/', '!.mkosi/', '!install/', '!examples/', '!modules.d/', '.test/']

337
0114.patch Normal file
View File

@ -0,0 +1,337 @@
From 64748b3383126ef2974a830a714636f752eba330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Thu, 6 Aug 2020 19:14:48 +0000
Subject: [PATCH] Adding the labels trigger file for the RHEL-6 branch
---
.github/rhel6-label-triggers.yml | 321 +++++++++++++++++++++++++++++++++++++++
1 file changed, 321 insertions(+)
diff --git a/.github/rhel6-label-triggers.yml b/.github/rhel6-label-triggers.yml
new file mode 100644
index 00000000..25783cd0
--- /dev/null
+++ b/.github/rhel6-label-triggers.yml
@@ -0,0 +1,321 @@
+# Add 'branches' label to any pull request
+branches:
+- "*"
+
+# Add 'rhel-6' branch label to any pull request
+rhel-6:
+- "*"
+
+# Add 'needs review' label to any pull request
+needs review:
+- "*"
+
+# Add 'repository' label to any root file changes
+repository:
+- ./*
+
+# Add 'github' label to any .github/ file changes
+github:
+- .github/*
+- .github/**/*
+
+# Add 'mkosi' label to any .mkosi/ file changes
+mkosi:
+- .mkosi/*
+- .mkosi/**/*
+- .mkosi/**/**/*
+
+# Add 'dracut install' label to any install/ file changes
+dracut install:
+- install/*
+- install/**/*
+
+# Add 'example' label to any examples/ file changes
+example:
+- examples/*
+- examples/**/*
+- examples/**/**/*
+
+# Add a 'modules' label to any modules.d/ file changes
+modules:
+- modules.d/*
+- modules.d/**/*
+
+# Add a 'bash' label to any bash module changes
+- modules.d/00bash/*
+
+# Add a 'bootchart' label to any bootchart module changes
+- modules.d/00bootchart/*
+
+# Add a 'dash' label to any dash module changes
+- modules.d/00dash/*
+
+# Add a 'mksh' label to any mksh module changes
+- modules.d/00mksh/*
+
+# Add a 'systemd' label to any systemd module changes
+- modules.d/00systemd/*
+
+# Add a 'warpclock' label to any warpclock module changes
+- modules.d/00warpclock/*
+
+# Add a 'fips' label to any fips module changes
+- modules.d/01fips/*
+
+# Add a 'systemd-initrd' label to any systemd-initrd module changes
+- modules.d/01systemd-initrd/*
+
+# Add a 'caps' label to any caps module changes
+- modules.d/02caps/*
+
+# Add a 'systemd-networkd' label to any systemd-networkd module changes
+- modules.d/02systemd-networkd/*
+
+# Add a 'modsign' label to any modsign module changes
+- modules.d/03modsign/*
+
+# Add a 'rescue' label to any rescue module changes
+- modules.d/03rescue/*
+
+# Add a 'watchdog' label to any watchdog module changes
+- modules.d/04watchdog/*
+
+# Add a 'busybox' label to any busybox module changes
+- modules.d/05busybox/*
+
+# Add a 'rngd' label to any rngd module changes
+- modules.d/06rngd/*
+
+# Add a 'i18n' label to any i18n module changes
+- modules.d/10i18n/*
+
+# Add a 'convertfs' label to any convertfs module changes
+- modules.d/30convertfs/*
+
+# Add a 'network-legacy' label to any network-legacy module changes
+- modules.d/35network-legacy/*
+
+# Add a 'network-manager' label to any network-manager module
+- modules.d/35network-manager/*
+
+# Add a 'network' label to any network module changes
+- modules.d/40network/*
+
+# Add a 'ifcfg' label to any ifcfg module changes
+- modules.d/45ifcfg/*
+
+# Add a 'url-lib' label to any url-lib module changes
+- modules.d/45url-lib/*
+
+# Add a 'drm' label to any drm module changes
+- modules.d/50drm/*
+
+# Add a 'gensplash' label to any gensplash module changes
+- modules.d/50gensplash/*
+
+# Add a 'plymouth' label to any plymouth module changes
+- modules.d/50plymouth/*
+
+# Add a 'cms' label to any cms module changes
+- modules.d/80cms/*
+
+# Add a 'lvmmerge' label to any lvmmerge module changes
+- modules.d/80lvmmerge/*
+
+# Add a 'cio_ignore' label to any cio_ignore module changes
+- modules.d/81cio_ignore/*
+
+# Add a 'btrfs' label to any btrfs module changes
+- modules.d/90btrfs/*
+
+# Add a 'crypt' label to any crypt module changes
+- modules.d/90crypt/*
+
+# Add a 'dm' label to any dm module changes
+- modules.d/90dm/*
+
+# Add a 'dmraid' label to any dmraid module changes
+- modules.d/90dmraid/*
+
+# Add a 'dmsquash-live' label to any dmsquash-live module changes
+- modules.d/90dmsquash-live/*
+
+# Add a 'dmsquash-live-ntfs' label to any dmsquash-live-ntfs changes
+- modules.d/90dmsquash-live-ntfs/*
+
+# Add a 'kernel-modules' label to any kernel-modules module changes
+- modules.d/90kernel-modules/*
+
+# Add a 'kernel-modules-extra' label to any kernel-modules-extra changes
+- modules.d/90kernel-modules-extra/*
+
+# Add a 'kernel-network-modules' label to any kernel-network-modules changes
+- modules.d/90kernel-network-modules/*
+
+# Add a 'livenet' label to any livenet module changes
+- modules.d/90livenet/*
+
+# Add a 'lvm' label to any lvm module changes
+- modules.d/90lvm/*
+
+# Add a 'mdraid' label to any mdraid module changes
+- modules.d/90mdraid/*
+
+# Add a 'multipath' label to any multipath module changes
+- modules.d/90multipath/*
+
+# Add a 'nvdimm' label to any nvdimm module changes
+- modules.d/90nvdimm/*
+
+# Add a 'ppcmac' label to any ppcmac module changes
+- modules.d/90ppcmac/*
+
+# Add a 'qemu' label to any qemu module changes
+- modules.d/90qemu/*
+
+# Add a 'qemu-net' label to any qemu-net module changes
+- modules.d/90qemu-net/*
+
+# Add a 'stratis' label to any stratis module changes
+- modules.d/90stratis/*
+
+# Add a 'crypt-gpg' label to any crypt-gpg module changes
+- modules.d/91crypt-gpg/*
+
+# Add a 'crypt-loop' label to any crypt-loop module changes
+- modules.d/91crypt-loop/*
+
+# Add a 'zipl' label to any zipl module changes
+- modules.d/91zipl/*
+
+# Add a 'cifs' label to any cifs module changes
+- modules.d/95cifs/*
+
+# Add a 'dasd' label to any dasd module changes
+- modules.d/95dasd/*
+
+# Add a 'dasd_mod' label to any dasd_mod module changes
+- modules.d/95dasd_mod/*
+
+# Add a 'dasd_rules' label to any dasd_rules module changes
+- modules.d/95dasd_rules/*
+
+# Add a 'dcssblk' label to any dcssblk module changes
+- modules.d/95dcssblk/*
+
+# Add a 'debug' label to any debug module changes
+- modules.d/95debug/*
+
+# Add a 'fcoe' label to any fcoe module changes
+- modules.d/95fcoe/*
+
+# Add a 'fcoe-uefi' label to any fcoe-uefi module changes
+- modules.d/95fcoe-uefi/*
+
+# Add a 'fstab-sys' label to any fstab-sys module changes
+- modules.d/95fstab-sys/*
+
+# Add a 'iscsi' label to any iscsi module changes
+- modules.d/95iscsi/*
+
+# Add a 'lunmask' label to any lunmask module changes
+- modules.d/95lunmask/*
+
+# Add a 'nbd' label to any nbd module changes
+- modules.d/95nbd/*
+
+# Add a 'nfs' label to any nfs module changes
+- modules.d/95nfs/*
+
+# Add a 'nvmf' label to any nvmf module changes
+- modules.d/95nvmf/*
+
+# Add a 'qeth_rules' label to any qeth_rules module changes
+- modules.d/95qeth_rules/*
+
+# Add a 'resume' label to any resume module changes
+- modules.d/95resume/*
+
+# Add a 'rootfs-block' label to any rootfs-block module changes
+- modules.d/95rootfs-block/*
+
+# Add a 'ssh-client' label to any ssh-client module changes
+- modules.d/95ssh-client/*
+
+# Add a 'terminfo' label to any terminfo module changes
+- modules.d/95terminfo/*
+
+# Add a 'udev-rules' label to any udev-rules module changes
+- modules.d/95udev-rules/*
+
+# Add a 'virtfs' label to any virtfs module changes
+- modules.d/95virtfs/*
+
+# Add a 'zfcp' label to any zfcp module changes
+- modules.d/95zfcp/*
+
+# Add a 'zfcp_rules' label to any zfcp_rules module changes
+- modules.d/95zfcp_rules/*
+
+# Add a 'znet' label to any znet module changes
+- modules.d/95znet/*
+
+# Add a 'securityfs' label to any securityfs module changes
+- modules.d/96securityfs/*
+
+# Add a 'biosdevname' label to any biosdevname module changes
+- modules.d/97biosdevname/*
+
+# Add a 'masterkey' label to any masterkey module changes
+- modules.d/97masterkey/*
+
+# Add a 'dracut-systemd' label to any dracut-systemd module changes
+- modules.d/98dracut-systemd/*
+
+# Add a 'ecryptfs' label to any ecryptfs module changes
+- modules.d/98ecryptfs/*
+
+# Add a 'integrity' label to any integrity module changes
+- modules.d/98integrity/*
+
+# Add a 'pollcdrom' label to any pollcdrom module changes
+- modules.d/98pollcdrom/*
+
+# Add a 'selinux' label to any selinux module changes
+- modules.d/98selinux/*
+
+# Add a 'syslog' label to any syslog module changes
+- modules.d/98syslog/*
+
+# Add a 'usrmount' label to any usrmount module changes
+- modules.d/98usrmount/*
+
+# Add a 'base' label to any base module changes
+- modules.d/99base/*
+
+# Add a 'fs-lib' label to any fs-lib module changes
+- modules.d/99fs-lib/*
+
+# Add a 'img-lib' label to any img-lib module changes
+- modules.d/99img-lib/*
+
+# Add a 'memstrack' label to any memstrack module changes
+- modules.d/99memstrack/*
+
+# Add a 'shutdown' label to any shutdown module changes
+- modules.d/99shutdown/*
+
+# Add a 'squash' label to any squash module changes
+- modules.d/99squash/*
+
+# Add a 'uefi-lib' label to any uefi-lib module changes
+- modules.d/99uefi-lib/*
+
+# Add 'test' label to any test/ file changes
+test:
+- test/*
+- test/**/*
+
+# Add 'dracut' label for anything else
+dracut:
+- any: ['!.github/', '!.mkosi/', '!install/', '!examples/', '!modules.d/', '.test/']

337
0115.patch Normal file
View File

@ -0,0 +1,337 @@
From 9521b435d05a59634f6f966db69912c292fd39dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Thu, 6 Aug 2020 19:15:07 +0000
Subject: [PATCH] Adding the labels trigger file for the RHEL-7 branch
---
.github/rhel7-label-triggers.yml | 321 +++++++++++++++++++++++++++++++++++++++
1 file changed, 321 insertions(+)
diff --git a/.github/rhel7-label-triggers.yml b/.github/rhel7-label-triggers.yml
new file mode 100644
index 00000000..5695c5f8
--- /dev/null
+++ b/.github/rhel7-label-triggers.yml
@@ -0,0 +1,321 @@
+# Add 'branches' label to any pull request
+branches:
+- "*"
+
+# Add 'rhel-7' branch label to any pull request
+rhel-7:
+- "*"
+
+# Add 'needs review' label to any pull request
+needs review:
+- "*"
+
+# Add 'repository' label to any root file changes
+repository:
+- ./*
+
+# Add 'github' label to any .github/ file changes
+github:
+- .github/*
+- .github/**/*
+
+# Add 'mkosi' label to any .mkosi/ file changes
+mkosi:
+- .mkosi/*
+- .mkosi/**/*
+- .mkosi/**/**/*
+
+# Add 'dracut install' label to any install/ file changes
+dracut install:
+- install/*
+- install/**/*
+
+# Add 'example' label to any examples/ file changes
+example:
+- examples/*
+- examples/**/*
+- examples/**/**/*
+
+# Add a 'modules' label to any modules.d/ file changes
+modules:
+- modules.d/*
+- modules.d/**/*
+
+# Add a 'bash' label to any bash module changes
+- modules.d/00bash/*
+
+# Add a 'bootchart' label to any bootchart module changes
+- modules.d/00bootchart/*
+
+# Add a 'dash' label to any dash module changes
+- modules.d/00dash/*
+
+# Add a 'mksh' label to any mksh module changes
+- modules.d/00mksh/*
+
+# Add a 'systemd' label to any systemd module changes
+- modules.d/00systemd/*
+
+# Add a 'warpclock' label to any warpclock module changes
+- modules.d/00warpclock/*
+
+# Add a 'fips' label to any fips module changes
+- modules.d/01fips/*
+
+# Add a 'systemd-initrd' label to any systemd-initrd module changes
+- modules.d/01systemd-initrd/*
+
+# Add a 'caps' label to any caps module changes
+- modules.d/02caps/*
+
+# Add a 'systemd-networkd' label to any systemd-networkd module changes
+- modules.d/02systemd-networkd/*
+
+# Add a 'modsign' label to any modsign module changes
+- modules.d/03modsign/*
+
+# Add a 'rescue' label to any rescue module changes
+- modules.d/03rescue/*
+
+# Add a 'watchdog' label to any watchdog module changes
+- modules.d/04watchdog/*
+
+# Add a 'busybox' label to any busybox module changes
+- modules.d/05busybox/*
+
+# Add a 'rngd' label to any rngd module changes
+- modules.d/06rngd/*
+
+# Add a 'i18n' label to any i18n module changes
+- modules.d/10i18n/*
+
+# Add a 'convertfs' label to any convertfs module changes
+- modules.d/30convertfs/*
+
+# Add a 'network-legacy' label to any network-legacy module changes
+- modules.d/35network-legacy/*
+
+# Add a 'network-manager' label to any network-manager module
+- modules.d/35network-manager/*
+
+# Add a 'network' label to any network module changes
+- modules.d/40network/*
+
+# Add a 'ifcfg' label to any ifcfg module changes
+- modules.d/45ifcfg/*
+
+# Add a 'url-lib' label to any url-lib module changes
+- modules.d/45url-lib/*
+
+# Add a 'drm' label to any drm module changes
+- modules.d/50drm/*
+
+# Add a 'gensplash' label to any gensplash module changes
+- modules.d/50gensplash/*
+
+# Add a 'plymouth' label to any plymouth module changes
+- modules.d/50plymouth/*
+
+# Add a 'cms' label to any cms module changes
+- modules.d/80cms/*
+
+# Add a 'lvmmerge' label to any lvmmerge module changes
+- modules.d/80lvmmerge/*
+
+# Add a 'cio_ignore' label to any cio_ignore module changes
+- modules.d/81cio_ignore/*
+
+# Add a 'btrfs' label to any btrfs module changes
+- modules.d/90btrfs/*
+
+# Add a 'crypt' label to any crypt module changes
+- modules.d/90crypt/*
+
+# Add a 'dm' label to any dm module changes
+- modules.d/90dm/*
+
+# Add a 'dmraid' label to any dmraid module changes
+- modules.d/90dmraid/*
+
+# Add a 'dmsquash-live' label to any dmsquash-live module changes
+- modules.d/90dmsquash-live/*
+
+# Add a 'dmsquash-live-ntfs' label to any dmsquash-live-ntfs changes
+- modules.d/90dmsquash-live-ntfs/*
+
+# Add a 'kernel-modules' label to any kernel-modules module changes
+- modules.d/90kernel-modules/*
+
+# Add a 'kernel-modules-extra' label to any kernel-modules-extra changes
+- modules.d/90kernel-modules-extra/*
+
+# Add a 'kernel-network-modules' label to any kernel-network-modules changes
+- modules.d/90kernel-network-modules/*
+
+# Add a 'livenet' label to any livenet module changes
+- modules.d/90livenet/*
+
+# Add a 'lvm' label to any lvm module changes
+- modules.d/90lvm/*
+
+# Add a 'mdraid' label to any mdraid module changes
+- modules.d/90mdraid/*
+
+# Add a 'multipath' label to any multipath module changes
+- modules.d/90multipath/*
+
+# Add a 'nvdimm' label to any nvdimm module changes
+- modules.d/90nvdimm/*
+
+# Add a 'ppcmac' label to any ppcmac module changes
+- modules.d/90ppcmac/*
+
+# Add a 'qemu' label to any qemu module changes
+- modules.d/90qemu/*
+
+# Add a 'qemu-net' label to any qemu-net module changes
+- modules.d/90qemu-net/*
+
+# Add a 'stratis' label to any stratis module changes
+- modules.d/90stratis/*
+
+# Add a 'crypt-gpg' label to any crypt-gpg module changes
+- modules.d/91crypt-gpg/*
+
+# Add a 'crypt-loop' label to any crypt-loop module changes
+- modules.d/91crypt-loop/*
+
+# Add a 'zipl' label to any zipl module changes
+- modules.d/91zipl/*
+
+# Add a 'cifs' label to any cifs module changes
+- modules.d/95cifs/*
+
+# Add a 'dasd' label to any dasd module changes
+- modules.d/95dasd/*
+
+# Add a 'dasd_mod' label to any dasd_mod module changes
+- modules.d/95dasd_mod/*
+
+# Add a 'dasd_rules' label to any dasd_rules module changes
+- modules.d/95dasd_rules/*
+
+# Add a 'dcssblk' label to any dcssblk module changes
+- modules.d/95dcssblk/*
+
+# Add a 'debug' label to any debug module changes
+- modules.d/95debug/*
+
+# Add a 'fcoe' label to any fcoe module changes
+- modules.d/95fcoe/*
+
+# Add a 'fcoe-uefi' label to any fcoe-uefi module changes
+- modules.d/95fcoe-uefi/*
+
+# Add a 'fstab-sys' label to any fstab-sys module changes
+- modules.d/95fstab-sys/*
+
+# Add a 'iscsi' label to any iscsi module changes
+- modules.d/95iscsi/*
+
+# Add a 'lunmask' label to any lunmask module changes
+- modules.d/95lunmask/*
+
+# Add a 'nbd' label to any nbd module changes
+- modules.d/95nbd/*
+
+# Add a 'nfs' label to any nfs module changes
+- modules.d/95nfs/*
+
+# Add a 'nvmf' label to any nvmf module changes
+- modules.d/95nvmf/*
+
+# Add a 'qeth_rules' label to any qeth_rules module changes
+- modules.d/95qeth_rules/*
+
+# Add a 'resume' label to any resume module changes
+- modules.d/95resume/*
+
+# Add a 'rootfs-block' label to any rootfs-block module changes
+- modules.d/95rootfs-block/*
+
+# Add a 'ssh-client' label to any ssh-client module changes
+- modules.d/95ssh-client/*
+
+# Add a 'terminfo' label to any terminfo module changes
+- modules.d/95terminfo/*
+
+# Add a 'udev-rules' label to any udev-rules module changes
+- modules.d/95udev-rules/*
+
+# Add a 'virtfs' label to any virtfs module changes
+- modules.d/95virtfs/*
+
+# Add a 'zfcp' label to any zfcp module changes
+- modules.d/95zfcp/*
+
+# Add a 'zfcp_rules' label to any zfcp_rules module changes
+- modules.d/95zfcp_rules/*
+
+# Add a 'znet' label to any znet module changes
+- modules.d/95znet/*
+
+# Add a 'securityfs' label to any securityfs module changes
+- modules.d/96securityfs/*
+
+# Add a 'biosdevname' label to any biosdevname module changes
+- modules.d/97biosdevname/*
+
+# Add a 'masterkey' label to any masterkey module changes
+- modules.d/97masterkey/*
+
+# Add a 'dracut-systemd' label to any dracut-systemd module changes
+- modules.d/98dracut-systemd/*
+
+# Add a 'ecryptfs' label to any ecryptfs module changes
+- modules.d/98ecryptfs/*
+
+# Add a 'integrity' label to any integrity module changes
+- modules.d/98integrity/*
+
+# Add a 'pollcdrom' label to any pollcdrom module changes
+- modules.d/98pollcdrom/*
+
+# Add a 'selinux' label to any selinux module changes
+- modules.d/98selinux/*
+
+# Add a 'syslog' label to any syslog module changes
+- modules.d/98syslog/*
+
+# Add a 'usrmount' label to any usrmount module changes
+- modules.d/98usrmount/*
+
+# Add a 'base' label to any base module changes
+- modules.d/99base/*
+
+# Add a 'fs-lib' label to any fs-lib module changes
+- modules.d/99fs-lib/*
+
+# Add a 'img-lib' label to any img-lib module changes
+- modules.d/99img-lib/*
+
+# Add a 'memstrack' label to any memstrack module changes
+- modules.d/99memstrack/*
+
+# Add a 'shutdown' label to any shutdown module changes
+- modules.d/99shutdown/*
+
+# Add a 'squash' label to any squash module changes
+- modules.d/99squash/*
+
+# Add a 'uefi-lib' label to any uefi-lib module changes
+- modules.d/99uefi-lib/*
+
+# Add 'test' label to any test/ file changes
+test:
+- test/*
+- test/**/*
+
+# Add 'dracut' label for anything else
+dracut:
+- any: ['!.github/', '!.mkosi/', '!install/', '!examples/', '!modules.d/', '.test/']

337
0116.patch Normal file
View File

@ -0,0 +1,337 @@
From 2be5e3ac4c6e14b184c17b60f70db4ae7b509b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Thu, 6 Aug 2020 19:15:45 +0000
Subject: [PATCH] Adding the labels trigger file for the RHEL-8 branch
---
.github/rhel8-label-triggers.yml | 321 +++++++++++++++++++++++++++++++++++++++
1 file changed, 321 insertions(+)
diff --git a/.github/rhel8-label-triggers.yml b/.github/rhel8-label-triggers.yml
new file mode 100644
index 00000000..1e64c059
--- /dev/null
+++ b/.github/rhel8-label-triggers.yml
@@ -0,0 +1,321 @@
+# Add 'branches' label to any pull request
+branches:
+- "*"
+
+# Add 'rhel-8' branch label to any pull request
+rhel-8:
+- "*"
+
+# Add 'needs review' label to any pull request
+needs review:
+- "*"
+
+# Add 'repository' label to any root file changes
+repository:
+- ./*
+
+# Add 'github' label to any .github/ file changes
+github:
+- .github/*
+- .github/**/*
+
+# Add 'mkosi' label to any .mkosi/ file changes
+mkosi:
+- .mkosi/*
+- .mkosi/**/*
+- .mkosi/**/**/*
+
+# Add 'dracut install' label to any install/ file changes
+dracut install:
+- install/*
+- install/**/*
+
+# Add 'example' label to any examples/ file changes
+example:
+- examples/*
+- examples/**/*
+- examples/**/**/*
+
+# Add a 'modules' label to any modules.d/ file changes
+modules:
+- modules.d/*
+- modules.d/**/*
+
+# Add a 'bash' label to any bash module changes
+- modules.d/00bash/*
+
+# Add a 'bootchart' label to any bootchart module changes
+- modules.d/00bootchart/*
+
+# Add a 'dash' label to any dash module changes
+- modules.d/00dash/*
+
+# Add a 'mksh' label to any mksh module changes
+- modules.d/00mksh/*
+
+# Add a 'systemd' label to any systemd module changes
+- modules.d/00systemd/*
+
+# Add a 'warpclock' label to any warpclock module changes
+- modules.d/00warpclock/*
+
+# Add a 'fips' label to any fips module changes
+- modules.d/01fips/*
+
+# Add a 'systemd-initrd' label to any systemd-initrd module changes
+- modules.d/01systemd-initrd/*
+
+# Add a 'caps' label to any caps module changes
+- modules.d/02caps/*
+
+# Add a 'systemd-networkd' label to any systemd-networkd module changes
+- modules.d/02systemd-networkd/*
+
+# Add a 'modsign' label to any modsign module changes
+- modules.d/03modsign/*
+
+# Add a 'rescue' label to any rescue module changes
+- modules.d/03rescue/*
+
+# Add a 'watchdog' label to any watchdog module changes
+- modules.d/04watchdog/*
+
+# Add a 'busybox' label to any busybox module changes
+- modules.d/05busybox/*
+
+# Add a 'rngd' label to any rngd module changes
+- modules.d/06rngd/*
+
+# Add a 'i18n' label to any i18n module changes
+- modules.d/10i18n/*
+
+# Add a 'convertfs' label to any convertfs module changes
+- modules.d/30convertfs/*
+
+# Add a 'network-legacy' label to any network-legacy module changes
+- modules.d/35network-legacy/*
+
+# Add a 'network-manager' label to any network-manager module
+- modules.d/35network-manager/*
+
+# Add a 'network' label to any network module changes
+- modules.d/40network/*
+
+# Add a 'ifcfg' label to any ifcfg module changes
+- modules.d/45ifcfg/*
+
+# Add a 'url-lib' label to any url-lib module changes
+- modules.d/45url-lib/*
+
+# Add a 'drm' label to any drm module changes
+- modules.d/50drm/*
+
+# Add a 'gensplash' label to any gensplash module changes
+- modules.d/50gensplash/*
+
+# Add a 'plymouth' label to any plymouth module changes
+- modules.d/50plymouth/*
+
+# Add a 'cms' label to any cms module changes
+- modules.d/80cms/*
+
+# Add a 'lvmmerge' label to any lvmmerge module changes
+- modules.d/80lvmmerge/*
+
+# Add a 'cio_ignore' label to any cio_ignore module changes
+- modules.d/81cio_ignore/*
+
+# Add a 'btrfs' label to any btrfs module changes
+- modules.d/90btrfs/*
+
+# Add a 'crypt' label to any crypt module changes
+- modules.d/90crypt/*
+
+# Add a 'dm' label to any dm module changes
+- modules.d/90dm/*
+
+# Add a 'dmraid' label to any dmraid module changes
+- modules.d/90dmraid/*
+
+# Add a 'dmsquash-live' label to any dmsquash-live module changes
+- modules.d/90dmsquash-live/*
+
+# Add a 'dmsquash-live-ntfs' label to any dmsquash-live-ntfs changes
+- modules.d/90dmsquash-live-ntfs/*
+
+# Add a 'kernel-modules' label to any kernel-modules module changes
+- modules.d/90kernel-modules/*
+
+# Add a 'kernel-modules-extra' label to any kernel-modules-extra changes
+- modules.d/90kernel-modules-extra/*
+
+# Add a 'kernel-network-modules' label to any kernel-network-modules changes
+- modules.d/90kernel-network-modules/*
+
+# Add a 'livenet' label to any livenet module changes
+- modules.d/90livenet/*
+
+# Add a 'lvm' label to any lvm module changes
+- modules.d/90lvm/*
+
+# Add a 'mdraid' label to any mdraid module changes
+- modules.d/90mdraid/*
+
+# Add a 'multipath' label to any multipath module changes
+- modules.d/90multipath/*
+
+# Add a 'nvdimm' label to any nvdimm module changes
+- modules.d/90nvdimm/*
+
+# Add a 'ppcmac' label to any ppcmac module changes
+- modules.d/90ppcmac/*
+
+# Add a 'qemu' label to any qemu module changes
+- modules.d/90qemu/*
+
+# Add a 'qemu-net' label to any qemu-net module changes
+- modules.d/90qemu-net/*
+
+# Add a 'stratis' label to any stratis module changes
+- modules.d/90stratis/*
+
+# Add a 'crypt-gpg' label to any crypt-gpg module changes
+- modules.d/91crypt-gpg/*
+
+# Add a 'crypt-loop' label to any crypt-loop module changes
+- modules.d/91crypt-loop/*
+
+# Add a 'zipl' label to any zipl module changes
+- modules.d/91zipl/*
+
+# Add a 'cifs' label to any cifs module changes
+- modules.d/95cifs/*
+
+# Add a 'dasd' label to any dasd module changes
+- modules.d/95dasd/*
+
+# Add a 'dasd_mod' label to any dasd_mod module changes
+- modules.d/95dasd_mod/*
+
+# Add a 'dasd_rules' label to any dasd_rules module changes
+- modules.d/95dasd_rules/*
+
+# Add a 'dcssblk' label to any dcssblk module changes
+- modules.d/95dcssblk/*
+
+# Add a 'debug' label to any debug module changes
+- modules.d/95debug/*
+
+# Add a 'fcoe' label to any fcoe module changes
+- modules.d/95fcoe/*
+
+# Add a 'fcoe-uefi' label to any fcoe-uefi module changes
+- modules.d/95fcoe-uefi/*
+
+# Add a 'fstab-sys' label to any fstab-sys module changes
+- modules.d/95fstab-sys/*
+
+# Add a 'iscsi' label to any iscsi module changes
+- modules.d/95iscsi/*
+
+# Add a 'lunmask' label to any lunmask module changes
+- modules.d/95lunmask/*
+
+# Add a 'nbd' label to any nbd module changes
+- modules.d/95nbd/*
+
+# Add a 'nfs' label to any nfs module changes
+- modules.d/95nfs/*
+
+# Add a 'nvmf' label to any nvmf module changes
+- modules.d/95nvmf/*
+
+# Add a 'qeth_rules' label to any qeth_rules module changes
+- modules.d/95qeth_rules/*
+
+# Add a 'resume' label to any resume module changes
+- modules.d/95resume/*
+
+# Add a 'rootfs-block' label to any rootfs-block module changes
+- modules.d/95rootfs-block/*
+
+# Add a 'ssh-client' label to any ssh-client module changes
+- modules.d/95ssh-client/*
+
+# Add a 'terminfo' label to any terminfo module changes
+- modules.d/95terminfo/*
+
+# Add a 'udev-rules' label to any udev-rules module changes
+- modules.d/95udev-rules/*
+
+# Add a 'virtfs' label to any virtfs module changes
+- modules.d/95virtfs/*
+
+# Add a 'zfcp' label to any zfcp module changes
+- modules.d/95zfcp/*
+
+# Add a 'zfcp_rules' label to any zfcp_rules module changes
+- modules.d/95zfcp_rules/*
+
+# Add a 'znet' label to any znet module changes
+- modules.d/95znet/*
+
+# Add a 'securityfs' label to any securityfs module changes
+- modules.d/96securityfs/*
+
+# Add a 'biosdevname' label to any biosdevname module changes
+- modules.d/97biosdevname/*
+
+# Add a 'masterkey' label to any masterkey module changes
+- modules.d/97masterkey/*
+
+# Add a 'dracut-systemd' label to any dracut-systemd module changes
+- modules.d/98dracut-systemd/*
+
+# Add a 'ecryptfs' label to any ecryptfs module changes
+- modules.d/98ecryptfs/*
+
+# Add a 'integrity' label to any integrity module changes
+- modules.d/98integrity/*
+
+# Add a 'pollcdrom' label to any pollcdrom module changes
+- modules.d/98pollcdrom/*
+
+# Add a 'selinux' label to any selinux module changes
+- modules.d/98selinux/*
+
+# Add a 'syslog' label to any syslog module changes
+- modules.d/98syslog/*
+
+# Add a 'usrmount' label to any usrmount module changes
+- modules.d/98usrmount/*
+
+# Add a 'base' label to any base module changes
+- modules.d/99base/*
+
+# Add a 'fs-lib' label to any fs-lib module changes
+- modules.d/99fs-lib/*
+
+# Add a 'img-lib' label to any img-lib module changes
+- modules.d/99img-lib/*
+
+# Add a 'memstrack' label to any memstrack module changes
+- modules.d/99memstrack/*
+
+# Add a 'shutdown' label to any shutdown module changes
+- modules.d/99shutdown/*
+
+# Add a 'squash' label to any squash module changes
+- modules.d/99squash/*
+
+# Add a 'uefi-lib' label to any uefi-lib module changes
+- modules.d/99uefi-lib/*
+
+# Add 'test' label to any test/ file changes
+test:
+- test/*
+- test/**/*
+
+# Add 'dracut' label for anything else
+dracut:
+- any: ['!.github/', '!.mkosi/', '!install/', '!examples/', '!modules.d/', '.test/']

1100
0117.patch Normal file
View File

File diff suppressed because it is too large Load Diff

30
0118.patch Normal file
View File

@ -0,0 +1,30 @@
From cafd314b70cdb70ad48a501a347edd3e6b652252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 7 Aug 2020 15:57:07 +0000
Subject: [PATCH] Update master-labels.yml
Fixing bad intentation
---
.github/workflows/master-labels.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/master-labels.yml b/.github/workflows/master-labels.yml
index 3202719f..ad92fd2b 100644
--- a/.github/workflows/master-labels.yml
+++ b/.github/workflows/master-labels.yml
@@ -2,11 +2,11 @@
# apply a label based on the paths that are modified in the pull request.
name: master-labeler
-on:
+ on:
schedule:
- cron: '*/15 * * * *'
- branches:
- - master
+ branches:
+ - master
jobs:
label:

47
0119.patch Normal file
View File

@ -0,0 +1,47 @@
From fc1d50b27046985d7882d7b4ff3abde374a39891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 7 Aug 2020 16:17:45 +0000
Subject: [PATCH] Update master-labels.yml
Removing branches not sure if they work with the cron scheduler in workflow actions
---
.github/workflows/master-labels.yml | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/master-labels.yml b/.github/workflows/master-labels.yml
index ad92fd2b..0a46425a 100644
--- a/.github/workflows/master-labels.yml
+++ b/.github/workflows/master-labels.yml
@@ -1,19 +1,17 @@
-# This workflow will triage pull requests for the RHEL-6 branch and
-# apply a label based on the paths that are modified in the pull request.
+# This workflow will triage pull request and apply a
+# label based on the paths that are modified in the pull request.
name: master-labeler
- on:
+on:
schedule:
- - cron: '*/15 * * * *'
- branches:
- - master
+ - cron: '*/15 * * * *'
jobs:
- label:
- runs-on: ubuntu-latest
- steps:
- - uses: paulfantom/periodic-labeler@master
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- GITHUB_REPOSITORY: ${{ github.repository }}
- LABEL_MAPPINGS_FILE: .github/master-label-triggers.yml
+ label:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: paulfantom/periodic-labeler@master
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GITHUB_REPOSITORY: ${{ github.repository }}
+ LABEL_MAPPINGS_FILE: .github/labeler.yml

20
0120.patch Normal file
View File

@ -0,0 +1,20 @@
From 3f4771ebf4826192ec95f17e4eb0b9114f319221 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Fri, 7 Aug 2020 18:54:43 +0200
Subject: [PATCH] .github: fix path to label workflow mapping file
---
.github/workflows/master-labels.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/master-labels.yml b/.github/workflows/master-labels.yml
index 0a46425a..249b2148 100644
--- a/.github/workflows/master-labels.yml
+++ b/.github/workflows/master-labels.yml
@@ -14,4 +14,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ github.repository }}
- LABEL_MAPPINGS_FILE: .github/labeler.yml
+ LABEL_MAPPINGS_FILE: .github/master-label-triggers.yml

359
0121.patch Normal file
View File

@ -0,0 +1,359 @@
From 0e30f33a32322f9b4510b14d4b835ba9ca20764b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 7 Aug 2020 18:39:46 +0000
Subject: [PATCH] New labels file
---
.github/master-label-triggers.yml | 313 ---------------------
.../workflows/{master-labels.yml => labels.yml} | 10 +-
2 files changed, 4 insertions(+), 319 deletions(-)
diff --git a/.github/master-label-triggers.yml b/.github/master-label-triggers.yml
deleted file mode 100644
index 8c654939..00000000
--- a/.github/master-label-triggers.yml
+++ /dev/null
@@ -1,313 +0,0 @@
-# Add 'needs review' label to any pull request
-needs review:
-- "*"
-
-# Add 'repository' label to any root file changes
-repository:
-- ./*
-
-# Add 'github' label to any .github/ file changes
-github:
-- .github/*
-- .github/**/*
-
-# Add 'mkosi' label to any .mkosi/ file changes
-mkosi:
-- .mkosi/*
-- .mkosi/**/*
-- .mkosi/**/**/*
-
-# Add 'dracut install' label to any install/ file changes
-dracut install:
-- install/*
-- install/**/*
-
-# Add 'example' label to any examples/ file changes
-example:
-- examples/*
-- examples/**/*
-- examples/**/**/*
-
-# Add a 'modules' label to any modules.d/ file changes
-modules:
-- modules.d/*
-- modules.d/**/*
-
-# Add a 'bash' label to any bash module changes
-- modules.d/00bash/*
-
-# Add a 'bootchart' label to any bootchart module changes
-- modules.d/00bootchart/*
-
-# Add a 'dash' label to any dash module changes
-- modules.d/00dash/*
-
-# Add a 'mksh' label to any mksh module changes
-- modules.d/00mksh/*
-
-# Add a 'systemd' label to any systemd module changes
-- modules.d/00systemd/*
-
-# Add a 'warpclock' label to any warpclock module changes
-- modules.d/00warpclock/*
-
-# Add a 'fips' label to any fips module changes
-- modules.d/01fips/*
-
-# Add a 'systemd-initrd' label to any systemd-initrd module changes
-- modules.d/01systemd-initrd/*
-
-# Add a 'caps' label to any caps module changes
-- modules.d/02caps/*
-
-# Add a 'systemd-networkd' label to any systemd-networkd module changes
-- modules.d/02systemd-networkd/*
-
-# Add a 'modsign' label to any modsign module changes
-- modules.d/03modsign/*
-
-# Add a 'rescue' label to any rescue module changes
-- modules.d/03rescue/*
-
-# Add a 'watchdog' label to any watchdog module changes
-- modules.d/04watchdog/*
-
-# Add a 'busybox' label to any busybox module changes
-- modules.d/05busybox/*
-
-# Add a 'rngd' label to any rngd module changes
-- modules.d/06rngd/*
-
-# Add a 'i18n' label to any i18n module changes
-- modules.d/10i18n/*
-
-# Add a 'convertfs' label to any convertfs module changes
-- modules.d/30convertfs/*
-
-# Add a 'network-legacy' label to any network-legacy module changes
-- modules.d/35network-legacy/*
-
-# Add a 'network-manager' label to any network-manager module
-- modules.d/35network-manager/*
-
-# Add a 'network' label to any network module changes
-- modules.d/40network/*
-
-# Add a 'ifcfg' label to any ifcfg module changes
-- modules.d/45ifcfg/*
-
-# Add a 'url-lib' label to any url-lib module changes
-- modules.d/45url-lib/*
-
-# Add a 'drm' label to any drm module changes
-- modules.d/50drm/*
-
-# Add a 'gensplash' label to any gensplash module changes
-- modules.d/50gensplash/*
-
-# Add a 'plymouth' label to any plymouth module changes
-- modules.d/50plymouth/*
-
-# Add a 'cms' label to any cms module changes
-- modules.d/80cms/*
-
-# Add a 'lvmmerge' label to any lvmmerge module changes
-- modules.d/80lvmmerge/*
-
-# Add a 'cio_ignore' label to any cio_ignore module changes
-- modules.d/81cio_ignore/*
-
-# Add a 'btrfs' label to any btrfs module changes
-- modules.d/90btrfs/*
-
-# Add a 'crypt' label to any crypt module changes
-- modules.d/90crypt/*
-
-# Add a 'dm' label to any dm module changes
-- modules.d/90dm/*
-
-# Add a 'dmraid' label to any dmraid module changes
-- modules.d/90dmraid/*
-
-# Add a 'dmsquash-live' label to any dmsquash-live module changes
-- modules.d/90dmsquash-live/*
-
-# Add a 'dmsquash-live-ntfs' label to any dmsquash-live-ntfs changes
-- modules.d/90dmsquash-live-ntfs/*
-
-# Add a 'kernel-modules' label to any kernel-modules module changes
-- modules.d/90kernel-modules/*
-
-# Add a 'kernel-modules-extra' label to any kernel-modules-extra changes
-- modules.d/90kernel-modules-extra/*
-
-# Add a 'kernel-network-modules' label to any kernel-network-modules changes
-- modules.d/90kernel-network-modules/*
-
-# Add a 'livenet' label to any livenet module changes
-- modules.d/90livenet/*
-
-# Add a 'lvm' label to any lvm module changes
-- modules.d/90lvm/*
-
-# Add a 'mdraid' label to any mdraid module changes
-- modules.d/90mdraid/*
-
-# Add a 'multipath' label to any multipath module changes
-- modules.d/90multipath/*
-
-# Add a 'nvdimm' label to any nvdimm module changes
-- modules.d/90nvdimm/*
-
-# Add a 'ppcmac' label to any ppcmac module changes
-- modules.d/90ppcmac/*
-
-# Add a 'qemu' label to any qemu module changes
-- modules.d/90qemu/*
-
-# Add a 'qemu-net' label to any qemu-net module changes
-- modules.d/90qemu-net/*
-
-# Add a 'stratis' label to any stratis module changes
-- modules.d/90stratis/*
-
-# Add a 'crypt-gpg' label to any crypt-gpg module changes
-- modules.d/91crypt-gpg/*
-
-# Add a 'crypt-loop' label to any crypt-loop module changes
-- modules.d/91crypt-loop/*
-
-# Add a 'zipl' label to any zipl module changes
-- modules.d/91zipl/*
-
-# Add a 'cifs' label to any cifs module changes
-- modules.d/95cifs/*
-
-# Add a 'dasd' label to any dasd module changes
-- modules.d/95dasd/*
-
-# Add a 'dasd_mod' label to any dasd_mod module changes
-- modules.d/95dasd_mod/*
-
-# Add a 'dasd_rules' label to any dasd_rules module changes
-- modules.d/95dasd_rules/*
-
-# Add a 'dcssblk' label to any dcssblk module changes
-- modules.d/95dcssblk/*
-
-# Add a 'debug' label to any debug module changes
-- modules.d/95debug/*
-
-# Add a 'fcoe' label to any fcoe module changes
-- modules.d/95fcoe/*
-
-# Add a 'fcoe-uefi' label to any fcoe-uefi module changes
-- modules.d/95fcoe-uefi/*
-
-# Add a 'fstab-sys' label to any fstab-sys module changes
-- modules.d/95fstab-sys/*
-
-# Add a 'iscsi' label to any iscsi module changes
-- modules.d/95iscsi/*
-
-# Add a 'lunmask' label to any lunmask module changes
-- modules.d/95lunmask/*
-
-# Add a 'nbd' label to any nbd module changes
-- modules.d/95nbd/*
-
-# Add a 'nfs' label to any nfs module changes
-- modules.d/95nfs/*
-
-# Add a 'nvmf' label to any nvmf module changes
-- modules.d/95nvmf/*
-
-# Add a 'qeth_rules' label to any qeth_rules module changes
-- modules.d/95qeth_rules/*
-
-# Add a 'resume' label to any resume module changes
-- modules.d/95resume/*
-
-# Add a 'rootfs-block' label to any rootfs-block module changes
-- modules.d/95rootfs-block/*
-
-# Add a 'ssh-client' label to any ssh-client module changes
-- modules.d/95ssh-client/*
-
-# Add a 'terminfo' label to any terminfo module changes
-- modules.d/95terminfo/*
-
-# Add a 'udev-rules' label to any udev-rules module changes
-- modules.d/95udev-rules/*
-
-# Add a 'virtfs' label to any virtfs module changes
-- modules.d/95virtfs/*
-
-# Add a 'zfcp' label to any zfcp module changes
-- modules.d/95zfcp/*
-
-# Add a 'zfcp_rules' label to any zfcp_rules module changes
-- modules.d/95zfcp_rules/*
-
-# Add a 'znet' label to any znet module changes
-- modules.d/95znet/*
-
-# Add a 'securityfs' label to any securityfs module changes
-- modules.d/96securityfs/*
-
-# Add a 'biosdevname' label to any biosdevname module changes
-- modules.d/97biosdevname/*
-
-# Add a 'masterkey' label to any masterkey module changes
-- modules.d/97masterkey/*
-
-# Add a 'dracut-systemd' label to any dracut-systemd module changes
-- modules.d/98dracut-systemd/*
-
-# Add a 'ecryptfs' label to any ecryptfs module changes
-- modules.d/98ecryptfs/*
-
-# Add a 'integrity' label to any integrity module changes
-- modules.d/98integrity/*
-
-# Add a 'pollcdrom' label to any pollcdrom module changes
-- modules.d/98pollcdrom/*
-
-# Add a 'selinux' label to any selinux module changes
-- modules.d/98selinux/*
-
-# Add a 'syslog' label to any syslog module changes
-- modules.d/98syslog/*
-
-# Add a 'usrmount' label to any usrmount module changes
-- modules.d/98usrmount/*
-
-# Add a 'base' label to any base module changes
-- modules.d/99base/*
-
-# Add a 'fs-lib' label to any fs-lib module changes
-- modules.d/99fs-lib/*
-
-# Add a 'img-lib' label to any img-lib module changes
-- modules.d/99img-lib/*
-
-# Add a 'memstrack' label to any memstrack module changes
-- modules.d/99memstrack/*
-
-# Add a 'shutdown' label to any shutdown module changes
-- modules.d/99shutdown/*
-
-# Add a 'squash' label to any squash module changes
-- modules.d/99squash/*
-
-# Add a 'uefi-lib' label to any uefi-lib module changes
-- modules.d/99uefi-lib/*
-
-# Add 'test' label to any test/ file changes
-test:
-- test/*
-- test/**/*
-
-# Add 'dracut' label for anything else
-dracut:
-- any: ['!.github/', '!.mkosi/', '!install/', '!examples/', '!modules.d/', '.test/']
diff --git a/.github/workflows/master-labels.yml b/.github/workflows/labels.yml
similarity index 50%
rename from .github/workflows/master-labels.yml
rename to .github/workflows/labels.yml
index 249b2148..0e8d34d6 100644
--- a/.github/workflows/master-labels.yml
+++ b/.github/workflows/labels.yml
@@ -1,17 +1,15 @@
-# This workflow will triage pull request and apply a
-# label based on the paths that are modified in the pull request.
+name: Label the Pull Requests automatically via Cron
-name: master-labeler
on:
- schedule:
+ schedule:
- cron: '*/15 * * * *'
jobs:
label:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-18.04
steps:
- uses: paulfantom/periodic-labeler@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ github.repository }}
- LABEL_MAPPINGS_FILE: .github/master-label-triggers.yml
+ LABEL_MAPPINGS_FILE: .github/labeler.yml

315
0122.patch Normal file
View File

@ -0,0 +1,315 @@
From c4f2b11b89efb5f70f338f4f437fe05aefbbf0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 7 Aug 2020 18:40:11 +0000
Subject: [PATCH] New label trigger file
---
.github/labeler.yml | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 299 insertions(+)
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000..61eb79f6
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,299 @@
+needs review:
+ - "*"
+
+repository:
+ - ./*
+
+github:
+ - .github/*
+ - .github/**/*
+
+dracut install:
+ - install/*
+ - install/**/*
+
+example:
+ - examples/*
+ - examples/**/*
+ - examples/**/**/*
+
+modules:
+ - modules.d/*
+ - modules.d/**/*
+
+bash:
+ - modules.d/00bash/*
+
+bootchart:
+ - modules.d/00bootchart/*
+
+dash:
+ - modules.d/00dash/*
+
+mksh:
+ - modules.d/00mksh/*
+
+systemd:
+ - modules.d/00systemd/*
+
+warpclock:
+ - modules.d/00warpclock/*
+
+fips:
+ - modules.d/01fips/*
+
+systemd-initrd:
+ - modules.d/01systemd-initrd/*
+
+caps:
+ - modules.d/02caps/*
+
+systemd-networkd:
+ - modules.d/02systemd-networkd/*
+
+modsign:
+ - modules.d/03modsign/*
+
+rescue:
+ - modules.d/03rescue/*
+
+watchdog:
+ - modules.d/04watchdog/*
+
+busybox:
+ - modules.d/05busybox/*
+
+rngd:
+ - modules.d/06rngd/*
+
+i18n:
+ - modules.d/10i18n/*
+
+convertfs:
+ - modules.d/30convertfs/*
+
+network-legacy:
+ - modules.d/35network-legacy/*
+
+network-manager:
+ - modules.d/35network-manager/*
+
+network:
+ - modules.d/40network/*
+
+ifcfg:
+ - modules.d/45ifcfg/*
+
+url-lib:
+ - modules.d/45url-lib/*
+
+drm:
+ - modules.d/50drm/*
+
+gensplash:
+ - modules.d/50gensplash/*
+
+plymouth:
+ - modules.d/50plymouth/*
+
+cms:
+ - modules.d/80cms/*
+
+lvmmerge:
+ - modules.d/80lvmmerge/*
+
+cio_ignore:
+ - modules.d/81cio_ignore/*
+
+btrfs:
+ - modules.d/90btrfs/*
+
+crypt:
+ - modules.d/90crypt/*
+
+dm:
+ - modules.d/90dm/*
+
+dmraid:
+ - modules.d/90dmraid/*
+
+dmsquash-live:
+ - modules.d/90dmsquash-live/*
+
+dmsquash-live-ntfs:
+ - modules.d/90dmsquash-live-ntfs/*
+
+kernel-modules:
+ - modules.d/90kernel-modules/*
+
+kernel-modules-extra:
+ - modules.d/90kernel-modules-extra/*
+
+kernel-network-modules:
+ - modules.d/90kernel-network-modules/*
+
+livenet:
+ - modules.d/90livenet/*
+
+lvm:
+ - modules.d/90lvm/*
+
+mdraid:
+ - modules.d/90mdraid/*
+
+multipath:
+ - modules.d/90multipath/*
+
+nvdimm:
+ - modules.d/90nvdimm/*
+
+ppcmac:
+ - modules.d/90ppcmac/*
+
+qemu:
+ - modules.d/90qemu/*
+
+qemu-net:
+ - modules.d/90qemu-net/*
+
+stratis:
+ - modules.d/90stratis/*
+
+crypt-gpg:
+ - modules.d/91crypt-gpg/*
+
+crypt-loop:
+ - modules.d/91crypt-loop/*
+
+zipl:
+ - modules.d/91zipl/*
+
+cifs:
+ - modules.d/95cifs/*
+
+dasd:
+ - modules.d/95dasd/*
+
+dasd_mod:
+ - modules.d/95dasd_mod/*
+
+dasd_rules:
+ - modules.d/95dasd_rules/*
+
+dcssblk:
+ - modules.d/95dcssblk/*
+
+debug:
+ - modules.d/95debug/*
+
+fcoe:
+ - modules.d/95fcoe/*
+
+fcoe-uefi:
+ - modules.d/95fcoe-uefi/*
+
+fstab-sys:
+ - modules.d/95fstab-sys/*
+
+iscsi:
+ - modules.d/95iscsi/*
+
+lunmask:
+ - modules.d/95lunmask/*
+
+nbd:
+ - modules.d/95nbd/*
+
+nfs:
+ - modules.d/95nfs/*
+
+nvmf:
+ - modules.d/95nvmf/*
+
+qeth_rules:
+ - modules.d/95qeth_rules/*
+
+resume:
+ - modules.d/95resume/*
+
+rootfs-block:
+ - modules.d/95rootfs-block/*
+
+ssh-client:
+ - modules.d/95ssh-client/*
+
+terminfo:
+ - modules.d/95terminfo/*
+
+udev-rules:
+ - modules.d/95udev-rules/*
+
+virtfs:
+ - modules.d/95virtfs/*
+
+zfcp:
+ - modules.d/95zfcp/*
+
+zfcp_rules:
+ - modules.d/95zfcp_rules/*
+
+znet:
+ - modules.d/95znet/*
+
+securityfs:
+ - modules.d/96securityfs/*
+
+biosdevname:
+ - modules.d/97biosdevname/*
+
+masterkey:
+- modules.d/97masterkey/*
+
+dracut-systemd:
+ - modules.d/98dracut-systemd/*
+
+ecryptfs:
+ - modules.d/98ecryptfs/*
+
+integrity:
+ - modules.d/98integrity/*
+
+pollcdrom:
+ - modules.d/98pollcdrom/*
+
+selinux:
+ - modules.d/98selinux/*
+
+syslog:
+ - modules.d/98syslog/*
+
+usrmount:
+ - modules.d/98usrmount/*
+
+base:
+ - modules.d/99base/*
+
+fs-lib:
+ - modules.d/99fs-lib/*
+
+img-lib:
+ - modules.d/99img-lib/*
+
+memstrack:
+ - modules.d/99memstrack/*
+
+shutdown:
+ - modules.d/99shutdown/*
+
+squash:
+ - modules.d/99squash/*
+
+uefi-lib:
+ - modules.d/99uefi-lib/*
+
+test:
+ - test/*
+ - test/**/*
+
+dracut:
+ - any: ['!.github/*', '!.mkosi/*', '!install/*', '!examples/*', '!modules.d/*', '.test/*']

21
0123.patch Normal file
View File

@ -0,0 +1,21 @@
From 5da70385bcece0655bed4c408214173de51768ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 7 Aug 2020 19:16:46 +0000
Subject: [PATCH] Removing dracut entry not compat with new plugin
---
.github/labeler.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 61eb79f6..6e232f3f 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -294,6 +294,3 @@ uefi-lib:
test:
- test/*
- test/**/*
-
-dracut:
- - any: ['!.github/*', '!.mkosi/*', '!install/*', '!examples/*', '!modules.d/*', '.test/*']

25
0124.patch Normal file
View File

@ -0,0 +1,25 @@
From 74f83fb9f355609121940e4a1d9bb5e73206ea3e Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Tue, 11 Aug 2020 19:55:35 +0200
Subject: [PATCH] 95nvmf: fix typo in the example documentation
---
modules.d/95nvmf/parse-nvmf-boot-connections.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/95nvmf/parse-nvmf-boot-connections.sh b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
index 61c6dec1..0ed53a81 100755
--- a/modules.d/95nvmf/parse-nvmf-boot-connections.sh
+++ b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
@@ -8,8 +8,8 @@
# Examples:
# nvmf.hostnqn=nqn.2014-08.org.nvmexpress:uuid:37303738-3034-584d-5137-333230423843
# nvmf.discover=rdma:192.168.1.3::4420
-# nvme.discover=tcp:192.168.1.3::4420
-# nvme.discover=tcp:192.168.1.3
+# nvmf.discover=tcp:192.168.1.3::4420
+# nvmf.discover=tcp:192.168.1.3
# nvmf.discover=fc:auto
#
# Note: FC does autodiscovery, so typically there is no need to

52
0125.patch Normal file
View File

@ -0,0 +1,52 @@
From f7e924c577cf113360798b1a670c584a3308c73f Mon Sep 17 00:00:00 2001
From: Frederick Grose <fgrose@sugarlabs.org>
Date: Sun, 9 Aug 2020 00:23:54 -0400
Subject: [PATCH] dmsquash-live-root: Remove obsolete osmin.img processing.
osmin.img is no longer used by anaconda or generated by
livemedia-creator. livecd-creator will soon drop it as well.
Removing this code will allow OverlayFS boots to proceed when
osmin.img is present in the .iso image.
---
modules.d/90dmsquash-live/dmsquash-live-root.sh | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
index 6324fe83..d686d255 100755
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
@@ -268,20 +268,6 @@ do_live_overlay() {
}
# end do_live_overlay()
-# we might have a genMinInstDelta delta file for anaconda to take advantage of
-if [ -e /run/initramfs/live/${live_dir}/osmin.img ]; then
- OSMINSQFS=/run/initramfs/live/${live_dir}/osmin.img
- # decompress the delta data
- dd if=$OSMINSQFS of=/run/initramfs/osmin.img 2> /dev/null
- OSMIN_SQUASHED_LOOPDEV=$( losetup -f )
- losetup -r $OSMIN_SQUASHED_LOOPDEV /run/initramfs/osmin.img
- mkdir -m 0755 -p /run/initramfs/squashfs.osmin
- mount -n -t squashfs -o ro $OSMIN_SQUASHED_LOOPDEV /run/initramfs/squashfs.osmin
- OSMIN_LOOPDEV=$( losetup -f )
- losetup -r $OSMIN_LOOPDEV /run/initramfs/squashfs.osmin/osmin
- umount -l /run/initramfs/squashfs.osmin
-fi
-
# we might have an embedded fs image on squashfs (compressed live)
if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then
SQUASHED="/run/initramfs/live/${live_dir}/${squash_image}"
@@ -370,12 +356,6 @@ if [ -n "$FSIMG" ]; then
fi
fi
-if [ -b "$OSMIN_LOOPDEV" ]; then
- # set up the devicemapper snapshot device, which will merge
- # the normal live fs image, and the delta, into a minimzied fs image
- echo "0 $sz snapshot $BASE_LOOPDEV $OSMIN_LOOPDEV P 8" | dmsetup create --readonly live-osimg-min
-fi
-
if [ -n "$reloadsysrootmountunit" ]; then
eval "$reloadsysrootmountunit"
systemctl daemon-reload

110
0126.patch Normal file
View File

@ -0,0 +1,110 @@
From fe761330e5db60f19f0ab2d937ea71a5b2438656 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Wed, 19 Aug 2020 11:11:14 -0400
Subject: [PATCH] Remove stratis module
It is obsolete. An approach which does not start the daemon is being worked
on.
Signed-off-by: mulhern <amulhern@redhat.com>
---
dracut.spec | 1 -
modules.d/90stratis/module-setup.sh | 33 -------------------------------
modules.d/90stratis/stratisd-init.service | 13 ------------
modules.d/90stratis/stratisd-start.sh | 3 ---
modules.d/90stratis/stratisd-stop.sh | 6 ------
5 files changed, 56 deletions(-)
diff --git a/dracut.spec b/dracut.spec
index 872c21cf..b1891a2f 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -366,7 +366,6 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
%{dracutlibdir}/modules.d/90mdraid
%{dracutlibdir}/modules.d/90multipath
%{dracutlibdir}/modules.d/90nvdimm
-%{dracutlibdir}/modules.d/90stratis
%{dracutlibdir}/modules.d/90ppcmac
%{dracutlibdir}/modules.d/90qemu
%{dracutlibdir}/modules.d/91crypt-gpg
diff --git a/modules.d/90stratis/module-setup.sh b/modules.d/90stratis/module-setup.sh
deleted file mode 100755
index e13000b4..00000000
--- a/modules.d/90stratis/module-setup.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-check() {
- require_binaries stratisd-init thin_check thin_repair mkfs.xfs xfs_admin xfs_growfs || return 1
- return 255
-}
-
-# called by dracut
-depends() {
- echo dm
- return 0
-}
-
-# called by dracut
-installkernel() {
- instmods xfs
-}
-
-# called by dracut
-install() {
-
- inst_multiple stratisd-init thin_check thin_repair mkfs.xfs xfs_admin xfs_growfs
-
- if dracut_module_included "systemd"; then
- inst_simple "${moddir}/stratisd-init.service" "${systemdsystemunitdir}/stratisd-init.service"
- systemctl -q --root "$initdir" enable stratisd-init.service
- else
- inst_hook pre-mount 25 "$moddir/stratisd-start.sh"
- inst_hook cleanup 25 "$moddir/stratisd-stop.sh"
- fi
-}
-
diff --git a/modules.d/90stratis/stratisd-init.service b/modules.d/90stratis/stratisd-init.service
deleted file mode 100644
index 1be2e33b..00000000
--- a/modules.d/90stratis/stratisd-init.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=A daemon that manages a pool of block devices to create flexible file systems
-Documentation=man:stratisd(8)
-Before=local-fs-pre.target
-DefaultDependencies=no
-
-[Service]
-Type=simple
-ExecStart=/sbin/stratisd-init --debug
-KillSignal=SIGINT
-
-[Install]
-WantedBy=sysinit.target
diff --git a/modules.d/90stratis/stratisd-start.sh b/modules.d/90stratis/stratisd-start.sh
deleted file mode 100755
index afcd81fd..00000000
--- a/modules.d/90stratis/stratisd-start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-stratisd-init --debug > /dev/kmsg 2>&1 &
\ No newline at end of file
diff --git a/modules.d/90stratis/stratisd-stop.sh b/modules.d/90stratis/stratisd-stop.sh
deleted file mode 100755
index f394a843..00000000
--- a/modules.d/90stratis/stratisd-stop.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
-
-pid=$(pidof stratisd-init)
-[ -n "$pid" ] && kill ${pid}

29
0127.patch Normal file
View File

@ -0,0 +1,29 @@
From dae2759e61b557ba646b772be81f5c2a52cef115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Wed, 19 Aug 2020 21:24:17 +0200
Subject: [PATCH] 95cifs: install new softdeps (sha512, gcm, ccm, aead2)
---
modules.d/95cifs/module-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh
index b3747dcc..81db541c 100755
--- a/modules.d/95cifs/module-setup.sh
+++ b/modules.d/95cifs/module-setup.sh
@@ -25,11 +25,11 @@ depends() {
installkernel() {
instmods cifs ipv6
# hash algos
- instmods md4 md5 sha256
+ instmods md4 md5 sha256 sha512
# ciphers
- instmods aes arc4 des ecb
+ instmods aes arc4 des ecb gcm aead2
# macs
- instmods hmac cmac
+ instmods hmac cmac ccm
}
# called by dracut

35
0128.patch Normal file
View File

@ -0,0 +1,35 @@
From 31d0b55b86e7e2a52511621d1253109c05fda6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Thu, 20 Aug 2020 17:36:30 +0200
Subject: [PATCH] 95cifs: pass rootflags to mount
---
modules.d/95cifs/cifs-lib.sh | 2 +-
modules.d/95cifs/cifsroot.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/95cifs/cifs-lib.sh b/modules.d/95cifs/cifs-lib.sh
index 8e192041..ab51106c 100755
--- a/modules.d/95cifs/cifs-lib.sh
+++ b/modules.d/95cifs/cifs-lib.sh
@@ -30,5 +30,5 @@ cifs_to_var() {
if [ ! "$cifsuser" -o ! "$cifspass" ]; then
die "For CIFS support you need to specify a cifsuser and cifspass either in the cifsuser and cifspass commandline parameters or in the root= CIFS URL."
fi
- options="user=$cifsuser,pass=$cifspass"
+ options="user=$cifsuser,pass=$cifspass,$(getarg rootflags=)"
}
diff --git a/modules.d/95cifs/cifsroot.sh b/modules.d/95cifs/cifsroot.sh
index 10f4f3bd..11d362e8 100755
--- a/modules.d/95cifs/cifsroot.sh
+++ b/modules.d/95cifs/cifsroot.sh
@@ -16,7 +16,7 @@ echo server: $server
echo path: $path
echo options: $options
-mount.cifs //$server/$path $NEWROOT -o $options && { [ -e /dev/root ] || ln -s null /dev/root ; }
+mount.cifs "//$server/$path" "$NEWROOT" -o "$options" && { [ -e /dev/root ] || ln -s null /dev/root ; }
# inject new exit_if_exists
echo 'settle_exit_if_exists="--exit-if-exists=/dev/root"; rm -f -- "$job"' > $hookdir/initqueue/cifs.sh

50
0129.patch Normal file
View File

@ -0,0 +1,50 @@
From da4c9a950f339f2e87a021f7d060bf7ac07f4f00 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Mon, 6 Jul 2020 14:47:28 +0200
Subject: [PATCH] 01fips: modprobe failures during manual module loading is not
fatal
Users might see
"modprobe: FATAL: Module xyz not found in directory"
The output from modprobe is semantically wrong in this case and
confuses users. Keep the warning for debugging purposes, but reduce
the severeness.
It now reads "Module xyz not found in directory"
Reference: bsc#1169997
---
modules.d/01fips/fips.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index 8fba135b..37cde0c0 100755
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -69,6 +69,14 @@ do_rhevh_check()
return 0
}
+nonfatal_modprobe()
+{
+ modprobe $1 2>&1 > /dev/stdout |
+ while read -r line || [ -n "$line" ]; do
+ echo "${line#modprobe: FATAL: }" >&2
+ done
+}
+
fips_load_crypto()
{
FIPSMODULES=$(cat /etc/fipsmodules)
@@ -77,7 +85,7 @@ fips_load_crypto()
mv /etc/modprobe.d/fips.conf /etc/modprobe.d/fips.conf.bak
for _module in $FIPSMODULES; do
if [ "$_module" != "tcrypt" ]; then
- if ! modprobe "${_module}" 2>/tmp/fips.modprobe_err; then
+ if ! nonfatal_modprobe "${_module}" 2>/tmp/fips.modprobe_err; then
# check if kernel provides generic algo
_found=0
while read _k _s _v || [ -n "$_k" ]; do

98
0130.patch Normal file
View File

@ -0,0 +1,98 @@
From e096d861ed8d5956152aa0ba48ca17fb2de6efe0 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Mon, 6 Jul 2020 16:36:42 +0200
Subject: [PATCH] 01fips: turn info calls into fips_info calls
systemd lets stdout go to journal only. Usually, this is desired
behavior to ensure that plymouth does not get disrupted.
However in the 01fips case, the system has to halt when the integrity
check fails to satisfy FIPS requirements. So the user will not be able
to inspect the journal.
As this is special to the fips module, we introduce a fips_info() which
works like info(), but deviates the output to stderr when running with
systemd.
Reference: bsc#1164076
---
modules.d/01fips/fips.sh | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index 37cde0c0..f46da5c6 100755
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -1,5 +1,17 @@
#!/bin/sh
+# systemd lets stdout go to journal only, but the system
+# has to halt when the integrity check fails to satisfy FIPS.
+if [ -z "$DRACUT_SYSTEMD" ]; then
+ fips_info() {
+ info "$*"
+ }
+else
+ fips_info() {
+ echo "$*" >&2
+ }
+fi
+
mount_boot()
{
boot=$(getarg boot=)
@@ -45,7 +57,7 @@ mount_boot()
[ -e "$boot" ] || return 1
mkdir /boot
- info "Mounting $boot as /boot"
+ fips_info "Mounting $boot as /boot"
mount -oro "$boot" /boot || return 1
elif [ -d "$NEWROOT/boot" ]; then
rm -fr -- /boot
@@ -65,7 +77,7 @@ do_rhevh_check()
warn "HMAC sum mismatch"
return 1
fi
- info "rhevh_check OK"
+ fips_info "rhevh_check OK"
return 0
}
@@ -81,7 +93,7 @@ fips_load_crypto()
{
FIPSMODULES=$(cat /etc/fipsmodules)
- info "Loading and integrity checking all crypto modules"
+ fips_info "Loading and integrity checking all crypto modules"
mv /etc/modprobe.d/fips.conf /etc/modprobe.d/fips.conf.bak
for _module in $FIPSMODULES; do
if [ "$_module" != "tcrypt" ]; then
@@ -100,7 +112,7 @@ fips_load_crypto()
done
mv /etc/modprobe.d/fips.conf.bak /etc/modprobe.d/fips.conf
- info "Self testing crypto algorithms"
+ fips_info "Self testing crypto algorithms"
modprobe tcrypt || return 1
rmmod tcrypt
}
@@ -114,7 +126,7 @@ do_fips()
KERNEL=$(uname -r)
- info "Checking integrity of kernel"
+ fips_info "Checking integrity of kernel"
if [ -e "/run/initramfs/live/vmlinuz0" ]; then
do_rhevh_check /run/initramfs/live/vmlinuz0 || return 1
elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then
@@ -153,7 +165,7 @@ do_fips()
(cd "${BOOT_IMAGE_HMAC%/*}" && sha512hmac -c "${BOOT_IMAGE_HMAC}") || return 1
fi
- info "All initrd crypto checks done"
+ fips_info "All initrd crypto checks done"
> /tmp/fipsdone

35
0131.patch Normal file
View File

@ -0,0 +1,35 @@
From 1855efb15af9009c1f6db77c1d9ce012129bcb71 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Tue, 26 Nov 2019 12:29:47 +0100
Subject: [PATCH] Document initqueue/online hook
---
dracut.modules.7.asc | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dracut.modules.7.asc b/dracut.modules.7.asc
index 81135cff..3c056430 100644
--- a/dracut.modules.7.asc
+++ b/dracut.modules.7.asc
@@ -93,13 +93,18 @@ udev state.
==== Initqueue settled
-This hooks (initqueue/settled) gets executed every time udev has settled.
+This hook (initqueue/settled) gets executed every time udev has settled.
==== Initqueue timeout
-This hooks (initqueue/timeout) gets executed, when the main loop counter becomes
+This hook (initqueue/timeout) gets executed, when the main loop counter becomes
half of the rd.retry counter.
+==== Initqueue online
+
+This hook (initqueue/online) gets executed whenever a network interface comes online
+(that is, once it is up and configured by the configured network module).
+
==== Initqueue finished
This hook (initqueue/finished) is called after udev has settled and

85
0132.patch Normal file
View File

@ -0,0 +1,85 @@
From 3b92d8bf84d8dac57ffc1293f6f5c6d621ddd267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 23 Aug 2020 18:15:32 -0300
Subject: [PATCH] dracut.sh: fix errors pointed out by shellcheck.
- use [ ] instead of calling test manually, as most of the script is
doing.
- use quotes in hostonly_cmdline blocks, specially when dealing with the
conf files, whose names are set by users/system administrators
- uefi_splash_image was being assigned set to `${dracutsysroot}...`, which
is a variable that doesn't exist.
- we don't want the conditional to run the output of fsfreeze as
commands. Instead, we just need to know if any of the fsfreeze commands
failed.
---
dracut.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dracut.sh b/dracut.sh
index c439fa02..fa2388fe 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1731,7 +1731,7 @@ fi
if [[ $do_strip = yes ]] ; then
# Prefer strip from elfutils for package size
declare strip_cmd=$(command -v eu-strip)
- test -z "$strip_cmd" && strip_cmd="strip"
+ [ -z "$strip_cmd" ] && strip_cmd="strip"
for p in $strip_cmd xargs find; do
if ! type -P $p >/dev/null; then
@@ -1824,7 +1824,7 @@ if [[ $hostonly_cmdline == "yes" ]] ; then
dinfo "Stored kernel commandline:"
for conf in $initdir/etc/cmdline.d/*.conf ; do
[ -e "$conf" ] || continue
- dinfo "$(< $conf)"
+ dinfo "$(< "$conf")"
_stored_cmdline=1
done
fi
@@ -2004,10 +2004,10 @@ umask 077
if [[ $uefi = yes ]]; then
if [[ $kernel_cmdline ]]; then
echo -n "$kernel_cmdline" > "$uefi_outdir/cmdline.txt"
- elif [[ $hostonly_cmdline = yes ]] && [ -d $initdir/etc/cmdline.d ];then
- for conf in $initdir/etc/cmdline.d/*.conf ; do
+ elif [[ $hostonly_cmdline = yes ]] && [ -d "$initdir/etc/cmdline.d" ];then
+ for conf in "$initdir"/etc/cmdline.d/*.conf ; do
[ -e "$conf" ] || continue
- printf "%s " "$(< $conf)" >> "$uefi_outdir/cmdline.txt"
+ printf "%s " "$(< "$conf")" >> "$uefi_outdir/cmdline.txt"
done
else
do_print_cmdline > "$uefi_outdir/cmdline.txt"
@@ -2020,7 +2020,7 @@ if [[ $uefi = yes ]]; then
[[ -s $dracutsysrootdir/usr/lib/os-release ]] && uefi_osrelease="$dracutsysrootdir/usr/lib/os-release"
[[ -s $dracutsysrootdir/etc/os-release ]] && uefi_osrelease="$dracutsysrootdir/etc/os-release"
[[ -s "${dracutsysrootdir}${uefi_splash_image}" ]] && \
- uefi_splash_image="${dracutsysroot}${uefi_splash_image}" || unset uefi_splash_image
+ uefi_splash_image="${dracutsysrootdir}${uefi_splash_image}" || unset uefi_splash_image
if objcopy \
${uefi_osrelease:+--add-section .osrel=$uefi_osrelease --change-section-vma .osrel=0x20000} \
@@ -2100,7 +2100,7 @@ freeze_ok_for_fstype() {
# and there's no reason to sync, and *definitely* no reason to fsfreeze.
# Another case where this happens is rpm-ostree, which performs its own sync/fsfreeze
# globally. See e.g. https://github.com/ostreedev/ostree/commit/8642ef5ab3fec3ac8eb8f193054852f83a8bc4d0
-if test -d $dracutsysrootdir/run/systemd/system; then
+if [ -d "$dracutsysrootdir/run/systemd/system" ]; then
if ! sync "$outfile" 2> /dev/null; then
dinfo "dracut: sync operation on newly created initramfs $outfile failed"
exit 1
@@ -2108,7 +2108,7 @@ if test -d $dracutsysrootdir/run/systemd/system; then
# use fsfreeze only if we're not writing to /
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
+ 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
fi

87
0133.patch Normal file
View File

@ -0,0 +1,87 @@
From 497916e13b1e7608f1b2278b0222f216fbcd8846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 23 Aug 2020 18:31:11 -0300
Subject: [PATCH] dracut.sh: fix some indentation.
Command level inside conditional and tab/space usage.
---
dracut.sh | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/dracut.sh b/dracut.sh
index fa2388fe..4d83d3ab 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -37,7 +37,7 @@ readonly dracut_cmd="$(readlink -f $0)"
set -o pipefail
usage() {
- [[ $sysroot_l ]] && dracutsysrootdir="$sysroot_l"
+ [[ $sysroot_l ]] && dracutsysrootdir="$sysroot_l"
[[ $dracutbasedir ]] || dracutbasedir=$dracutsysrootdir/usr/lib/dracut
if [[ -f $dracutbasedir/dracut-version.sh ]]; then
. $dracutbasedir/dracut-version.sh
@@ -436,20 +436,20 @@ unset append_args_l
unset rebuild_file
while :
do
- if [ "$1" == "--" ]; then
- shift; break
- fi
- if [ "$1" == "--rebuild" ]; then
- append_args_l="yes"
+ if [ "$1" == "--" ]; then
+ shift; break
+ fi
+ if [ "$1" == "--rebuild" ]; then
+ append_args_l="yes"
rebuild_file=$2
if [ ! -e $rebuild_file ]; then
echo "Image file '$rebuild_file', for rebuild, does not exist!"
exit 1
fi
abs_rebuild_file=$(readlink -f "$rebuild_file") && rebuild_file="$abs_rebuild_file"
- shift; continue
- fi
- shift
+ shift; continue
+ fi
+ shift
done
# get output file name and kernel version from command line arguments
@@ -944,15 +944,15 @@ case "${drivers_dir}" in
''|*lib/modules/${kernel}|*lib/modules/${kernel}/) ;;
*)
[[ "$DRACUT_KMODDIR_OVERRIDE" ]] || {
- printf "%s\n" "dracut: -k/--kmoddir path must contain \"lib/modules\" as a parent of your kernel module directory,"
- printf "%s\n" "dracut: or modules may not be placed in the correct location inside the initramfs."
- printf "%s\n" "dracut: was given: ${drivers_dir}"
- printf "%s\n" "dracut: expected: $(dirname ${drivers_dir})/lib/modules/${kernel}"
- printf "%s\n" "dracut: Please move your modules into the correct directory structure and pass the new location,"
- printf "%s\n" "dracut: or set DRACUT_KMODDIR_OVERRIDE=1 to ignore this check."
- exit 1
- }
- ;;
+ printf "%s\n" "dracut: -k/--kmoddir path must contain \"lib/modules\" as a parent of your kernel module directory,"
+ printf "%s\n" "dracut: or modules may not be placed in the correct location inside the initramfs."
+ printf "%s\n" "dracut: was given: ${drivers_dir}"
+ printf "%s\n" "dracut: expected: $(dirname ${drivers_dir})/lib/modules/${kernel}"
+ printf "%s\n" "dracut: Please move your modules into the correct directory structure and pass the new location,"
+ printf "%s\n" "dracut: or set DRACUT_KMODDIR_OVERRIDE=1 to ignore this check."
+ exit 1
+ }
+ ;;
esac
readonly TMPDIR="$(realpath -e "$tmpdir")"
@@ -1993,7 +1993,7 @@ fi
if (( maxloglvl >= 5 )) && (( verbosity_mod_l >= 0 )); then
if [[ $allowlocal ]]; then
- "$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img"| ddebug
+ "$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img"| ddebug
else
lsinitrd "${DRACUT_TMPDIR}/initramfs.img"| ddebug
fi

85
0134.patch Normal file
View File

@ -0,0 +1,85 @@
From d795211778faa0a56fea2c0adc4e8a3e67392b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 10:33:50 +0000
Subject: [PATCH] Adding code of conduct
---
.github/CODE_OF_CONDUCT.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++
README.md | 1 +
2 files changed, 57 insertions(+)
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..50ed1730
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,56 @@
+# Dracut Code of Conduct
+
+This code of conduct outlines our expectations for participants within the Dracut community, as well as steps for reporting unacceptable behavior.
+We are committed to providing a welcoming and inspiring community for all and expect our code of conduct to be honored.
+Anyone who violates this code of conduct may be banned from the community.
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others’ private information, such as a physical or email address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the project maintainer responsible for enforcement Harald Hoyer <harald@redhat.com>.
+All complaints will be reviewed and investigated promptly and fairly and will result in a response that is deemed necessary and appropriate to the circumstances.
+Project maintainers are obligated to respect the privacy and security of the reporter of any incident.
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq.
+Translations are available at https://www.contributor-covenant.org/translations.
diff --git a/README.md b/README.md
index 0ab54ea6..1932da4d 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@ dracut
dracut is an event driven initramfs infrastructure.
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](code_of_conduct.md)
[![Build Status](https://travis-ci.org/dracutdevs/dracut.svg?branch=master)](https://travis-ci.org/dracutdevs/dracut)
[![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)

26
0135.patch Normal file
View File

@ -0,0 +1,26 @@
From fece5bfcac527b6695ca04840a1a154c283e4063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 11:47:06 +0000
Subject: [PATCH] Adding a pull request template
---
.github/pull_request_template.md | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..ef281c3d
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,10 @@
+This pull request changes...
+
+## Changes
+
+## Checklist
+- [ ] I have tested it locally
+- [ ] I have reviewed and updated any documentation if relevant
+- [ ] I am providing new code and test(s) for it
+
+Fixes #

24
0136.patch Normal file
View File

@ -0,0 +1,24 @@
From b7a7735c1d83ade0e748d336c8ab1a569f431107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Pawe=C5=82=20Gajc?= <tpgxyz@gmail.com>
Date: Wed, 26 Aug 2020 11:19:24 +0200
Subject: [PATCH] Do not start inside container
Host should take care of good entropy pool
#791
---
modules.d/06rngd/rngd.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules.d/06rngd/rngd.service b/modules.d/06rngd/rngd.service
index 570fbedb..dd5374d7 100644
--- a/modules.d/06rngd/rngd.service
+++ b/modules.d/06rngd/rngd.service
@@ -2,6 +2,7 @@
Description=Hardware RNG Entropy Gatherer Daemon
DefaultDependencies=no
Before=systemd-udevd.service
+ConditionVirtualization=!container
[Service]
ExecStart=/usr/sbin/rngd -f

42
0137.patch Normal file
View File

@ -0,0 +1,42 @@
From cd1a0025120c60be1a1da0a1fe0d566671c667d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 16:02:20 +0000
Subject: [PATCH] Adding a bug report template
---
.github/ISSUE_TEMPLATE/bug_report.md | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..c63bc5ba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,26 @@
+---
+name: \U0001F41B Bug report
+about: A report of an error in a recent Dracut version
+labels: 'bug'
+---
+
+**Describe the bug**
+A clear and concise description of what the error is.
+
+**Distribution used**
+Which distribution was this behaviour seen in?
+
+**Dracut version**
+Which dracut version was this behaviour seen in?
+
+**Init system**
+Which init system is being used?
+
+**To Reproduce**
+Steps or code to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context you like about the problem here.

24
0138.patch Normal file
View File

@ -0,0 +1,24 @@
From 455c5dbd35adda783cd34b0377f9cd52eab07d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 16:02:40 +0000
Subject: [PATCH] Adding a feature request template
---
.github/ISSUE_TEMPLATE/feature_request.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..84347563
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,8 @@
+---
+name: \U0002728 Feature Request
+about: A request for enhancement in Dracut
+labels: 'enhancement'
+---
+
+**Describe the enhancement**
+A clear and concise description of what the enhancement is that you would like to see.

24
0139.patch Normal file
View File

@ -0,0 +1,24 @@
From 0132527b8f377795287542d1ddfeee2a690a7782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 16:03:37 +0000
Subject: [PATCH] Adding documentation template
---
.github/ISSUE_TEMPLATE/documentation.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 00000000..7efadfaf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,8 @@
+---
+name: \U0001F4D6 Documentation
+about: Suggest an improvement for documentation in Dracut
+labels: 'documents'
+---
+
+**Describe the documentation**
+A clear and concise description of what should be better documented.

19
0140.patch Normal file
View File

@ -0,0 +1,19 @@
From de2712775286faa0f37b245811f905d50632f117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 16:21:08 +0000
Subject: [PATCH] Adding security policy
---
.github/SECURITY.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 00000000..ea909b51
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,3 @@
+Security is very important to us. If you discover any issue regarding security, we'd appreciate a non-public disclosure of
+the information, so please disclose the information responsibly by sending an email to Harald Hoyer harald@redhat.com and not by creating a GitHub issue.
+We will respond swiftly to fix verifiable security issues with the disclosure being coordinated with distributions and relevant security teams.

45
0141.patch Normal file
View File

@ -0,0 +1,45 @@
From d2b3289aa5f047e03ca2c4e103bef844a2f0d0d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 17:11:41 +0000
Subject: [PATCH] Fix Unicode
---
.github/ISSUE_TEMPLATE/bug_report.md | 2 +-
.github/ISSUE_TEMPLATE/documentation.md | 2 +-
.github/ISSUE_TEMPLATE/feature_request.md | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c63bc5ba..d57b92ab 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,5 +1,5 @@
---
-name: \U0001F41B Bug report
+name: "\U0001F41B Bug report"
about: A report of an error in a recent Dracut version
labels: 'bug'
---
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index 7efadfaf..e3501ccb 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -1,5 +1,5 @@
---
-name: \U0001F4D6 Documentation
+name: "\U0001F4D6 Documentation"
about: Suggest an improvement for documentation in Dracut
labels: 'documents'
---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 84347563..987e2f8d 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
---
-name: \U0002728 Feature Request
+name: "\U0002728 Feature Request"
about: A request for enhancement in Dracut
labels: 'enhancement'
---

35
0142.patch Normal file
View File

@ -0,0 +1,35 @@
From ff78577d3f405a2066692cc67a8e5b1d30d7d3e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 17:36:35 +0000
Subject: [PATCH] Fix Unicode and dracut install labeler
---
.github/ISSUE_TEMPLATE/feature_request.md | 2 +-
.github/labeler.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 987e2f8d..1772c237 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
---
-name: "\U0002728 Feature Request"
+name: "\U00002728 Feature Request"
about: A request for enhancement in Dracut
labels: 'enhancement'
---
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 6e232f3f..71d88f01 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -8,7 +8,7 @@ github:
- .github/*
- .github/**/*
-dracut install:
+dracut-install:
- install/*
- install/**/*

23
0143.patch Normal file
View File

@ -0,0 +1,23 @@
From d418e292e3f15e4ca88870265229282a631e3df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Fri, 28 Aug 2020 17:57:45 +0000
Subject: [PATCH] Fix CoC URL
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1932da4d..2c08b7b3 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ dracut
dracut is an event driven initramfs infrastructure.
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](code_of_conduct.md)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](.github/CODE_OF_CONDUCT.md)
[![Build Status](https://travis-ci.org/dracutdevs/dracut.svg?branch=master)](https://travis-ci.org/dracutdevs/dracut)
[![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)

53
0144.patch Normal file
View File

@ -0,0 +1,53 @@
From ff2d8bdfb3a56d97bcac9750ff16c3437a96cbe7 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Mon, 17 Aug 2020 15:46:17 +0200
Subject: [PATCH] dracut.sh: Add --version
---
dracut.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dracut.sh b/dracut.sh
index 4d83d3ab..2f2fadd1 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -242,6 +242,7 @@ Creates initial ramdisk images for preloading modules
--kernel-image [FILE] location of the kernel image
--regenerate-all Regenerate all initramfs images at the default location
for the kernel versions found on the system
+ --version Display version
If [LIST] has multiple arguments, then you have to put these in quotes.
@@ -252,6 +253,14 @@ For example:
EOF
}
+long_version() {
+ [[ $dracutbasedir ]] || dracutbasedir=$dracutsysrootdir/usr/lib/dracut
+ if [[ -f $dracutbasedir/dracut-version.sh ]]; then
+ . $dracutbasedir/dracut-version.sh
+ fi
+ echo "dracut $DRACUT_VERSION"
+}
+
# Fills up host_devs stack variable and makes sure there are no duplicates
push_host_devs() {
local _dev
@@ -416,6 +425,7 @@ rearrange_params()
--long no-hostonly-i18n \
--long hostonly-i18n \
--long no-machineid \
+ --long version \
-- "$@")
if (( $? != 0 )); then
@@ -616,6 +626,7 @@ while :; do
kernel_image_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;;
--no-machineid)
machine_id_l="no";;
+ --version) long_version; exit 1 ;;
--) shift; break;;
*) # should not even reach this point

24
0145.patch Normal file
View File

@ -0,0 +1,24 @@
From a5372b8ba85bc70c68771feab9504ebd5a336625 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Fri, 28 Aug 2020 17:12:27 +0200
Subject: [PATCH] Add --version to man page
---
dracut.8.asc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dracut.8.asc b/dracut.8.asc
index a873611e..b99019e5 100644
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -265,6 +265,9 @@ example:
**-v, --verbose**::
increase verbosity level (default is info(4))
+**--version**::
+ display version and exit
+
**-q, --quiet**:: decrease verbosity level (default is info(4))
**-c, --conf** _<dracut configuration file>_::

23
0146.patch Normal file
View File

@ -0,0 +1,23 @@
From f87605e3ab2955e7b50d34ba0462332cb1f079d8 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 13 Jul 2020 08:51:33 +0200
Subject: [PATCH] dracut.cmdline.7.asc: fix typo
---
dracut.cmdline.7.asc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index 751f5276..c37d427e 100644
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -607,7 +607,7 @@ interface name. Better name it "bootnet" or "bluesocket".
boolean, bring up network even without netroot set
**vlan=**__<vlanname>__:__<phydevice>__::
- Setup vlan device named <vlanname> on <phydeivce>.
+ Setup vlan device named <vlanname> on <phydevice>.
We support the four styles of vlan names: VLAN_PLUS_VID (vlan0005),
VLAN_PLUS_VID_NO_PAD (vlan5), DEV_PLUS_VID (eth0.0005),
DEV_PLUS_VID_NO_PAD (eth0.5)

4
0001-fix-graphics-startup-failure-with-the-rhgb-paramter-.patch → 0147.patch
View File

@ -1,7 +1,7 @@
From d76e9ad5d7b16edb3c544ed3888640bea0efbf72 Mon Sep 17 00:00:00 2001 From d76e9ad5d7b16edb3c544ed3888640bea0efbf72 Mon Sep 17 00:00:00 2001
From: GuoChuang <guo.chuang@zte.com.cn> From: GuoChuang <guo.chuang@zte.com.cn>
Date: Mon, 24 Aug 2020 14:03:48 +0800 Date: Mon, 24 Aug 2020 14:03:48 +0800
Subject: [PATCH 1/8] fix graphics startup failure with the rhgb paramter in Subject: [PATCH] fix graphics startup failure with the rhgb paramter in
CentOS8.2 CentOS8.2
--- ---
@ -21,6 +21,4 @@ index 08cfa45b..c69b2cfa 100755
if strstr "$(modinfo -F filename $(<$i) 2>/dev/null)" radeon.ko; then if strstr "$(modinfo -F filename $(<$i) 2>/dev/null)" radeon.ko; then
hostonly='' instmods amdkfd hostonly='' instmods amdkfd
fi fi
--
2.26.2

158
0148.patch Normal file
View File

@ -0,0 +1,158 @@
From 39d90012a652fa4d9d2534d0168ddad8cacec248 Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@redhat.com>
Date: Thu, 10 Sep 2020 02:18:02 +0800
Subject: [PATCH] 04watchdog: split the watchdog module install
In some cases, user only want to include the watchdog module, not the
wdctl or any other userspace helper. For example, systemd have a
RebootWatchdogSec option that use watchdog to prevent reboot hangs. And
it can help prevent machines hangs when reboot directly within the
initramfs stage. So split the module installation to a standlone module.
Also when watchdog-module get included, install driver for all loaded
watchdog instaed of only install driver for active watchdog. Both
watchdog and watchdog-module return 255 in check(), so it's enabled only
when manually included, the watchdog may get configured/activated later.
Signed-off-by: Kairui Song <kasong@redhat.com>
---
modules.d/04watchdog-modules/module-setup.sh | 61 ++++++++++++++++++++++++++++
modules.d/04watchdog/module-setup.sh | 50 +----------------------
2 files changed, 63 insertions(+), 48 deletions(-)
diff --git a/modules.d/04watchdog-modules/module-setup.sh b/modules.d/04watchdog-modules/module-setup.sh
new file mode 100755
index 00000000..5fbd769b
--- /dev/null
+++ b/modules.d/04watchdog-modules/module-setup.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# called by dracut
+check() {
+ return 255
+}
+
+# called by dracut
+depends() {
+ return 0
+}
+
+# called by dracut
+install() {
+ return 0
+}
+
+installkernel() {
+ local -A _drivers
+ local _alldrivers _wdtdrv _wdtppath _dir
+ [[ -d /sys/class/watchdog/ ]] || return
+ for _dir in /sys/class/watchdog/*; do
+ [[ -d "$_dir" ]] || continue
+ [[ -f "$_dir/state" ]] || continue
+ # device/modalias will return driver of this device
+ _wdtdrv=$(< "$_dir/device/modalias")
+ # There can be more than one module represented by same
+ # modalias. Currently load all of them.
+ # TODO: Need to find a way to avoid any unwanted module
+ # represented by modalias
+ _wdtdrv=$(modprobe --set-version "$kernel" -R $_wdtdrv 2>/dev/null)
+ if [[ $_wdtdrv ]]; then
+ instmods $_wdtdrv
+ for i in $_wdtdrv; do
+ _drivers[$i]=1
+ done
+ fi
+ # however in some cases, we also need to check that if there is
+ # a specific driver for the parent bus/device. In such cases
+ # we also need to enable driver for parent bus/device.
+ _wdtppath=$(readlink -f "$_dir/device")
+ while [[ -d "$_wdtppath" ]] && [[ "$_wdtppath" != "/sys" ]]; do
+ _wdtppath=$(readlink -f "$_wdtppath/..")
+ [[ -f "$_wdtppath/modalias" ]] || continue
+
+ _wdtdrv=$(< "$_wdtppath/modalias")
+ _wdtdrv=$(modprobe --set-version "$kernel" -R $_wdtdrv 2>/dev/null)
+ if [[ $_wdtdrv ]]; then
+ instmods $_wdtdrv
+ for i in $_wdtdrv; do
+ _drivers[$i]=1
+ done
+ fi
+ done
+ done
+ # ensure that watchdog module is loaded as early as possible
+ _alldrivers="${!_drivers[*]}"
+ [[ $_alldrivers ]] && echo "rd.driver.pre=${_alldrivers// /,}" > ${initdir}/etc/cmdline.d/00-watchdog.conf
+
+ return 0
+}
diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh
index 7566d651..15bcd897 100755
--- a/modules.d/04watchdog/module-setup.sh
+++ b/modules.d/04watchdog/module-setup.sh
@@ -7,7 +7,7 @@ check() {
# called by dracut
depends() {
- return 0
+ return "watchdog-modules"
}
# called by dracut
@@ -27,53 +27,7 @@ install() {
inst_hook cleanup 00 "$moddir/watchdog.sh"
inst_hook cleanup 99 "$moddir/watchdog.sh"
fi
+
inst_hook emergency 02 "$moddir/watchdog-stop.sh"
inst_multiple -o wdctl
}
-
-installkernel() {
- local -A _drivers
- local _alldrivers _active _wdtdrv _wdtppath _dir
- [[ -d /sys/class/watchdog/ ]] || return
- for _dir in /sys/class/watchdog/*; do
- [[ -d "$_dir" ]] || continue
- [[ -f "$_dir/state" ]] || continue
- _active=$(< "$_dir/state")
- ! [[ $hostonly ]] || [[ "$_active" = "active" ]] || continue
- # device/modalias will return driver of this device
- _wdtdrv=$(< "$_dir/device/modalias")
- # There can be more than one module represented by same
- # modalias. Currently load all of them.
- # TODO: Need to find a way to avoid any unwanted module
- # represented by modalias
- _wdtdrv=$(modprobe --set-version "$kernel" -R $_wdtdrv 2>/dev/null)
- if [[ $_wdtdrv ]]; then
- instmods $_wdtdrv
- for i in $_wdtdrv; do
- _drivers[$i]=1
- done
- fi
- # however in some cases, we also need to check that if there is
- # a specific driver for the parent bus/device. In such cases
- # we also need to enable driver for parent bus/device.
- _wdtppath=$(readlink -f "$_dir/device")
- while [[ -d "$_wdtppath" ]] && [[ "$_wdtppath" != "/sys" ]]; do
- _wdtppath=$(readlink -f "$_wdtppath/..")
- [[ -f "$_wdtppath/modalias" ]] || continue
-
- _wdtdrv=$(< "$_wdtppath/modalias")
- _wdtdrv=$(modprobe --set-version "$kernel" -R $_wdtdrv 2>/dev/null)
- if [[ $_wdtdrv ]]; then
- instmods $_wdtdrv
- for i in $_wdtdrv; do
- _drivers[$i]=1
- done
- fi
- done
- done
- # ensure that watchdog module is loaded as early as possible
- _alldrivers="${!_drivers[*]}"
- [[ $_alldrivers ]] && echo "rd.driver.pre=${_alldrivers// /,}" > ${initdir}/etc/cmdline.d/00-watchdog.conf
-
- return 0
-}

226
0149.patch Normal file
View File

@ -0,0 +1,226 @@
From 37502d4c8974370a38496f44e279d56061fe67c3 Mon Sep 17 00:00:00 2001
From: Antz <antzz@protonmail.ch>
Date: Sat, 29 Aug 2020 14:54:19 +0200
Subject: [PATCH] 90crypt: make `rd.luks.key` usable with encrypted keydev.
Introduce prefix `keysource:` for the values of `rd.luks.partuuid`,
`rd.luks.serial` and `rd.luks.uuid`.
If specified, ask for passphrase instead of waiting for keydevs to come
online.
---
dracut.cmdline.7.asc | 45 ++++++++++++++++++++++++++++++++++++++
modules.d/90crypt/cryptroot-ask.sh | 18 +++++++++++++--
modules.d/90crypt/parse-crypt.sh | 43 ++++++++++++++++++++++++++----------
3 files changed, 92 insertions(+), 14 deletions(-)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index c37d427e..dbbbfed0 100644
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -302,6 +302,8 @@ crypto LUKS
The comparisons also matches, if _<luks uuid>_ is only the beginning of the
LUKS UUID, so you don't have to specify the full UUID.
This parameter can be specified multiple times.
+ _<luks uuid>_ may be prefixed by the keyword `keysource:`, see
+ _rd.luks.key_ below.
**rd.luks.allow-discards=**__<luks uuid>__::
Allow using of discards (TRIM) requests for LUKS partitions with the given
@@ -397,6 +399,49 @@ head -32c /dev/urandom > rootkey.key
cryptsetup --batch-mode --key-file rootkey.key \
luksFormat /dev/sda47
--
+
+You can also use regular key files on an encrypted _keydev_.
+
+Compared to using GPG encrypted keyfiles on an unencrypted
+device this provides the following advantages:
+
+- you can unlock your disk(s) using multiple passphrases
+- better security by not loosing the key stretching mechanism
+
+To use an encrypted _keydev_ you *must* ensure that it becomes
+available by using the keyword `keysource`, e.g.
+`rd.luks.uuid=keysource:aaaa`
+_aaaa_ being the uuid of the encrypted _keydev_.
+
+Example:
+
+Lets assume you have three disks _A_, _B_ and _C_ with the uuids
+_aaaa_, _bbbb_ and _cccc_. +
+You want to unlock _A_ and _B_ using keyfile _keyfile_. +
+The unlocked volumes be _A'_, _B'_ and _C'_ with the uuids
+_AAAA_, _BBBB_ and _CCCC_. +
+_keyfile_ is saved on _C'_ as _/keyfile_.
+
+One luks keyslot of each _A_, _B_ and _C_ is setup with a
+passphrase. +
+Another luks keyslot of each _A_ and _B_ is setup with _keyfile_.
+
+To boot this configuration you could use:
+[listing]
+--
+rd.luks.uuid=aaaa
+rd.luks.uuid=bbbb
+rd.luks.uuid=keysource:cccc
+rd.luks.key=/keyfile:UUID=CCCC
+--
+Dracut asks for the passphrase for _C_ and uses the
+keyfile to unlock _A_ and _B_. +
+If getting the passphrase for _C_ fails it falls back to
+asking for the passphrases for _A_ and _B_.
+
+If you want _C'_ to stay unlocked, specify a luks name for
+it, e.g. `rd.luks.name=cccc=mykeys`, otherwise it gets closed
+when not needed anymore.
===============================
MD RAID
diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index 97047ae9..19d2bcb4 100755
--- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -20,8 +20,11 @@ fi
# default luksname - luks-UUID
luksname=$2
+# is_keysource - ask for passphrase even if a rd.luks.key argument is set
+is_keysource=${3:-0}
+
# number of tries
-numtries=${3:-10}
+numtries=${4:-10}
# TODO: improve to support what cmdline does
if [ -f /etc/crypttab ] && getargbool 1 rd.luks.crypttab -d -n rd_NO_CRYPTTAB; then
@@ -137,6 +140,8 @@ if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then
if cryptsetup --key-file "$luksfile" $cryptsetupopts luksOpen "$device" "$luksname"; then
ask_passphrase=0
fi
+elif [ "$is_keysource" -ne 0 ]; then
+ info "Asking for passphrase because $device is a keysource."
else
while [ -n "$(getarg rd.luks.key)" ]; do
if tmp=$(getkey /tmp/luks.keys $device); then
@@ -151,7 +156,7 @@ else
info "No key found for $device. Will try $numtries time(s) more later."
initqueue --unique --onetime --settled \
--name cryptroot-ask-$luksname \
- $(command -v cryptroot-ask) "$device" "$luksname" "$(($numtries-1))"
+ $(command -v cryptroot-ask) "$device" "$luksname" "$is_keysource" "$(($numtries-1))"
exit 0
fi
unset tmp
@@ -178,6 +183,15 @@ if [ $ask_passphrase -ne 0 ]; then
unset _timeout
fi
+if [ "$is_keysource" -ne 0 -a ${luksname##luks-} != "$luksname" ]; then
+ luks_close="$(command -v cryptsetup) close"
+ {
+ printf -- '[ -e /dev/mapper/%s ] && ' "$luksname"
+ printf -- '%s "%s"\n' "$luks_close" "$luksname"
+ } >> "$hookdir/cleanup/31-crypt-keysource.sh"
+ unset luks_close
+fi
+
unset device luksname luksfile
# mark device as asked
diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
index f6911cc8..4e899fed 100755
--- a/modules.d/90crypt/parse-crypt.sh
+++ b/modules.d/90crypt/parse-crypt.sh
@@ -49,6 +49,12 @@ else
if [ -n "$PARTUUID" ]; then
for uuid in $PARTUUID; do
+ is_keysource=0
+ _uuid=$uuid
+ uuid=${uuid#keysource:}
+ [ $uuid != $_uuid ] && is_keysource=1
+ unset _uuid
+
uuid=${uuid##luks-}
if luksname=$(_cryptgetargsname "rd.luks.name=$uuid="); then
luksname="${luksname#$uuid=}"
@@ -61,7 +67,7 @@ else
printf -- 'ENV{ID_PART_ENTRY_UUID}=="*%s*", ' "$uuid"
printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
- printf -- '$env{DEVNAME} %s %s"\n' "$luksname" "$tout"
+ printf -- '$env{DEVNAME} %s %s"\n' "$luksname" "$is_keysource" "$tout"
} >> /etc/udev/rules.d/70-luks.rules.new
else
luksname=$(dev_unit_name "$luksname")
@@ -81,6 +87,12 @@ else
elif [ -n "$SERIAL" ]; then
for serialid in $SERIAL; do
+ is_keysource=0
+ _serialid=$serialid
+ serialid=${serialid#keysource:}
+ [ $serialid != $_serialid ] && is_keysource=1
+ unset _serialid
+
serialid=${serialid##luks-}
if luksname=$(_cryptgetargsname "rd.luks.name=$serialid="); then
luksname="${luksname#$serialid=}"
@@ -93,7 +105,7 @@ else
printf -- 'ENV{ID_SERIAL_SHORT}=="*%s*", ' "$serialid"
printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
- printf -- '$env{DEVNAME} %s %s"\n' "$luksname" "$tout"
+ printf -- '$env{DEVNAME} %s %s"\n' "$luksname" "$is_keysource" "$tout"
} >> /etc/udev/rules.d/70-luks.rules.new
else
luksname=$(dev_unit_name "$luksname")
@@ -113,6 +125,12 @@ else
elif [ -n "$LUKS" ]; then
for luksid in $LUKS; do
+ is_keysource=0
+ _luksid=$luksid
+ luksid=${luksid#keysource:}
+ [ $luksid != $_luksid ] && is_keysource=1
+ unset _luksid
+
luksid=${luksid##luks-}
if luksname=$(_cryptgetargsname "rd.luks.name=$luksid="); then
luksname="${luksname#$luksid=}"
@@ -126,7 +144,7 @@ else
printf -- 'ENV{ID_FS_UUID}=="*%s*", ' "$luksid"
printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
- printf -- '$env{DEVNAME} %s %s"\n' "$luksname" "$tout"
+ printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
} >> /etc/udev/rules.d/70-luks.rules.new
else
luksname=$(dev_unit_name "$luksname")
@@ -143,15 +161,16 @@ else
fi
fi
- uuid=$luksid
- while [ "$uuid" != "${uuid#*-}" ]; do uuid=${uuid%%-*}${uuid#*-}; done
- printf -- '[ -e /dev/disk/by-id/dm-uuid-CRYPT-LUKS?-*%s*-* ] || exit 1\n' $uuid \
- >> "$hookdir/initqueue/finished/90-crypt.sh"
-
- {
- printf -- '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid
- printf -- 'warn "crypto LUKS UUID "%s" not found"\n' $luksid
- } >> "$hookdir/emergency/90-crypt.sh"
+ if [ $is_keysource -eq 0 ]; then
+ uuid=$luksid
+ while [ "$uuid" != "${uuid#*-}" ]; do uuid=${uuid%%-*}${uuid#*-}; done
+ printf -- '[ -e /dev/disk/by-id/dm-uuid-CRYPT-LUKS?-*%s*-* ] || exit 1\n' $uuid \
+ >> "$hookdir/initqueue/finished/90-crypt.sh"
+ {
+ printf -- '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid
+ printf -- 'warn "crypto LUKS UUID "%s" not found"\n' $luksid
+ } >> "$hookdir/emergency/90-crypt.sh"
+ fi
done
elif getargbool 0 rd.auto; then
if [ -z "$DRACUT_SYSTEMD" ]; then

24
0150.patch Normal file
View File

@ -0,0 +1,24 @@
From f3e328a7fd30c7109a3af188e84e621770bb6b85 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Sun, 20 Sep 2020 09:44:08 +0200
Subject: [PATCH] dracut.spec: include the 04watchdog-modules module
Include the 04watchdog-modules module that was added in 39d90012a652
("04watchdog: split the watchdog module install").
---
dracut.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/dracut.spec b/dracut.spec
index b1891a2f..3597c6e5 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -348,6 +348,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
%{dracutlibdir}/modules.d/03modsign
%{dracutlibdir}/modules.d/03rescue
%{dracutlibdir}/modules.d/04watchdog
+%{dracutlibdir}/modules.d/04watchdog-modules
%{dracutlibdir}/modules.d/05busybox
%{dracutlibdir}/modules.d/06rngd
%{dracutlibdir}/modules.d/10i18n

4
0001-Include-devfreq-drivers-in-initrd.patch → 0151.patch
View File

@ -1,5 +1,5 @@
From 38ea7e821bce1cbf3c8fe4dc044a809301a77f82 Mon Sep 17 00:00:00 2001 From 38ea7e821bce1cbf3c8fe4dc044a809301a77f82 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Tue, 22 Sep 2020 12:01:17 +0100 Date: Tue, 22 Sep 2020 12:01:17 +0100
Subject: [PATCH] Include devfreq drivers in initrd Subject: [PATCH] Include devfreq drivers in initrd
@ -23,6 +23,4 @@ index 764675eb..3ed749c7 100755
"=drivers/dma" \ "=drivers/dma" \
"=drivers/extcon" \ "=drivers/extcon" \
"=drivers/gpio" \ "=drivers/gpio" \
--
2.26.2

4
0001-50drm-fix-ambiguous-redirects.patch → 0152.patch
View File

@ -1,7 +1,7 @@
From 89cd7a46296b34230c21775b24b226cc47ec1527 Mon Sep 17 00:00:00 2001 From 89cd7a46296b34230c21775b24b226cc47ec1527 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com> From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sat, 26 Sep 2020 14:50:31 +0200 Date: Sat, 26 Sep 2020 14:50:31 +0200
Subject: [PATCH 1/3] 50drm: fix ambiguous redirects Subject: [PATCH] 50drm: fix ambiguous redirects
If i contains a space, there is a need to protect the variable usage in some cases. If i contains a space, there is a need to protect the variable usage in some cases.
@ -28,6 +28,4 @@ index c69b2cfa..81d2e662 100755
hostonly='' instmods amdkfd hostonly='' instmods amdkfd
fi fi
fi fi
--
2.26.2

4
0002-50drm-Include-drm-platform-drivers-in-hostonly.patch → 0153.patch
View File

@ -1,7 +1,7 @@
From 5afd3cfc96aac425f7de23de60b94ab88dc189ee Mon Sep 17 00:00:00 2001 From 5afd3cfc96aac425f7de23de60b94ab88dc189ee Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com> From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sat, 26 Sep 2020 13:15:55 +0200 Date: Sat, 26 Sep 2020 13:15:55 +0200
Subject: [PATCH 2/3] 50drm: Include drm platform drivers in hostonly Subject: [PATCH] 50drm: Include drm platform drivers in hostonly
On arm, many drm drivers are located in the plaform bus. On arm, many drm drivers are located in the plaform bus.
@ -26,6 +26,4 @@ index 81d2e662..ad0e6d80 100755
[[ -e $i ]] || continue [[ -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" -S "iw_handler_get_spy" $(<"$i"); then
if strstr "$(modinfo -F filename $(<"$i") 2>/dev/null)" radeon.ko; then if strstr "$(modinfo -F filename $(<"$i") 2>/dev/null)" radeon.ko; then
--
2.26.2

4
0003-50drm-Check-drm_encoder_init-along-drm_crtc_init.patch → 0154.patch
View File

@ -1,7 +1,7 @@
From dee4f26adcfd9a9a0e4664f0dc22974b60b5eea2 Mon Sep 17 00:00:00 2001 From dee4f26adcfd9a9a0e4664f0dc22974b60b5eea2 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com> From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sat, 26 Sep 2020 15:01:55 +0200 Date: Sat, 26 Sep 2020 15:01:55 +0200
Subject: [PATCH 3/3] 50drm: Check drm_encoder_init along drm_crtc_init Subject: [PATCH] 50drm: Check drm_encoder_init along drm_crtc_init
Some modules are involved in the display output without to rely on Some modules are involved in the display output without to rely on
drm_crtc_init. drm_crtc_init.
@ -34,6 +34,4 @@ index ad0e6d80..ddc1223d 100755
+ dracut_instmods -o -s "drm_crtc_init|drm_dev_register|drm_encoder_init" "=drivers/gpu/drm" "=drivers/staging" + dracut_instmods -o -s "drm_crtc_init|drm_dev_register|drm_encoder_init" "=drivers/gpu/drm" "=drivers/staging"
fi fi
} }
--
2.26.2

33
0155.patch Normal file
View File

@ -0,0 +1,33 @@
From 9eb1d1ed5ed1eb5008e6173c1ae0480132a4bea4 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 2 Oct 2020 13:40:00 +0200
Subject: [PATCH] dracut.spec: remove fedora pre 30 quirks
---
dracut.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dracut.spec b/dracut.spec
index 3597c6e5..fded5f17 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -279,7 +279,7 @@ rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1*
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
-%if 0%{?fedora} <= 30 || 0%{?rhel} <= 8
+%if 0%{?rhel} > 0 && 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
@@ -478,8 +478,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} <= 30 || 0%{?rhel} <= 8
-# FIXME: remove after F30
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 8
%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
%endif

28
0156.patch Normal file
View File

@ -0,0 +1,28 @@
From ee6ce3100312ed1505ccb6d5b60bf075ea2b1712 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 2 Oct 2020 13:50:40 +0200
Subject: [PATCH] dracut.spec: Use make macros
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
---
dracut.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dracut.spec b/dracut.spec
index fded5f17..e20aaa67 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -203,11 +203,10 @@ cp %{SOURCE1} .
%endif
${NULL}
-make %{?_smp_mflags}
+%make_build
%install
-make %{?_smp_mflags} install \
- DESTDIR=$RPM_BUILD_ROOT \
+%make_install %{?_smp_mflags} \
libdir=%{_prefix}/lib
echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh

113
dracut.spec
View File

@ -5,7 +5,7 @@
# 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 63.git20200529 %define dist_free_release 157.git20201002
Name: dracut Name: dracut
Version: 050 Version: 050
@ -88,11 +88,102 @@ Patch57: 0057.patch
Patch58: 0058.patch Patch58: 0058.patch
Patch59: 0059.patch Patch59: 0059.patch
Patch60: 0060.patch Patch60: 0060.patch
Patch61: 0001-fix-graphics-startup-failure-with-the-rhgb-paramter-.patch Patch61: 0061.patch
Patch62: 0001-Include-devfreq-drivers-in-initrd.patch Patch62: 0062.patch
Patch63: 0001-50drm-fix-ambiguous-redirects.patch Patch63: 0063.patch
Patch64: 0002-50drm-Include-drm-platform-drivers-in-hostonly.patch Patch64: 0064.patch
Patch65: 0003-50drm-Check-drm_encoder_init-along-drm_crtc_init.patch Patch65: 0065.patch
Patch66: 0066.patch
Patch67: 0067.patch
Patch68: 0068.patch
Patch69: 0069.patch
Patch70: 0070.patch
Patch71: 0071.patch
Patch72: 0072.patch
Patch73: 0073.patch
Patch74: 0074.patch
Patch75: 0075.patch
Patch76: 0076.patch
Patch77: 0077.patch
Patch78: 0078.patch
Patch79: 0079.patch
Patch80: 0080.patch
Patch81: 0081.patch
Patch82: 0082.patch
Patch83: 0083.patch
Patch84: 0084.patch
Patch85: 0085.patch
Patch86: 0086.patch
Patch87: 0087.patch
Patch88: 0088.patch
Patch89: 0089.patch
Patch90: 0090.patch
Patch91: 0091.patch
Patch92: 0092.patch
Patch93: 0093.patch
Patch94: 0094.patch
Patch95: 0095.patch
Patch96: 0096.patch
Patch97: 0097.patch
Patch98: 0098.patch
Patch99: 0099.patch
Patch100: 0100.patch
Patch101: 0101.patch
Patch102: 0102.patch
Patch103: 0103.patch
Patch104: 0104.patch
Patch105: 0105.patch
Patch106: 0106.patch
Patch107: 0107.patch
Patch108: 0108.patch
Patch109: 0109.patch
Patch110: 0110.patch
Patch111: 0111.patch
Patch112: 0112.patch
Patch113: 0113.patch
Patch114: 0114.patch
Patch115: 0115.patch
Patch116: 0116.patch
Patch117: 0117.patch
Patch118: 0118.patch
Patch119: 0119.patch
Patch120: 0120.patch
Patch121: 0121.patch
Patch122: 0122.patch
Patch123: 0123.patch
Patch124: 0124.patch
Patch125: 0125.patch
Patch126: 0126.patch
Patch127: 0127.patch
Patch128: 0128.patch
Patch129: 0129.patch
Patch130: 0130.patch
Patch131: 0131.patch
Patch132: 0132.patch
Patch133: 0133.patch
Patch134: 0134.patch
Patch135: 0135.patch
Patch136: 0136.patch
Patch137: 0137.patch
Patch138: 0138.patch
Patch139: 0139.patch
Patch140: 0140.patch
Patch141: 0141.patch
Patch142: 0142.patch
Patch143: 0143.patch
Patch144: 0144.patch
Patch145: 0145.patch
Patch146: 0146.patch
Patch147: 0147.patch
Patch148: 0148.patch
Patch149: 0149.patch
Patch150: 0150.patch
Patch151: 0151.patch
Patch152: 0152.patch
Patch153: 0153.patch
Patch154: 0154.patch
Patch155: 0155.patch
Patch156: 0156.patch
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
@ -344,7 +435,7 @@ rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1*
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 %if 0%{?rhel} > 0 && 0%{?rhel} <= 8
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d 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 install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
%endif %endif
@ -413,6 +504,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
%{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/06rngd %{dracutlibdir}/modules.d/06rngd
%{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/10i18n
@ -431,7 +523,6 @@ 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
@ -439,6 +530,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
%{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
@ -542,11 +634,14 @@ 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 %if 0%{?rhel} > 0 && 0%{?rhel} <= 8
%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh %{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
%endif %endif
%changelog %changelog
* 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