e4f609fba2
From-source-git-commit: a24e1272faba2875f9b78fcf42109028af0869bc * switch to dracut-ng upstream fork The original dracut repository is no longer maintained, new initiative was started: https://github.com/dracut-ng/dracut-ng/ * applied additional fixes 9df3cb58a19f38157a615c311356cfd6ae55d2d7 fix(rngd): install system service file 0b65ac224d831cc96da940cce510523c7276a5ec feat(hwdb): add hwdb module to install hwdb.bin on demand 10b86edba3ffe0ce13c5f43ff0193cdf04661358 fix(nvmf): move /etc/nvme/host{nqn,id} requirement to hostonly bad2bc80cdcfac8915374497cc47ce9d5670d015 fix(systemd): explicitly install some libs that will not be statically included 55a56c546bde71fb42c99aadd96e98fca2199823 fix(dracut): move hooks directory from /usr/lib to /var/lib 110fec3e41faf47277447f1c56635c5a876c1f96 feat(ifcfg): minimize s390-specific network configuration aspects b6913f66b6c9e9ea81fd0832405c170876bc993a refactor(ifcfg): delete code duplication using iface_get_subchannels() cbc5eece88b8f6d0e69fdfbb8f34eabb45425c86 fix(znet): append to udev rules so each rd.znet_ifname is effective 7ad6fef8fe110093939c422b5c3b381ebe47e4e9 feat(qeth_rules): remove qeth handling consolidated in 95znet addb383b375fd0db07eacf8a9f5d9b4e23343855 docs(dracut.cmdline): generalize description of rd.znet 86b6e2979999cf5ecce8c76c6230d1f085b3a333 feat(znet): use zdev for consolidated device configuration 1ff6be8aef787513b8143df444a1dd2d696b0944 feat(dasd): minimize dasd handling consolidated in s390-tools a82045ef34bc8c913502eba37b6b9c60709d6997 feat(dasd_mod): minimize dasd handling consolidated in s390-tools 7294e45b5204e47bb8ee2108e2c38c5843e64fac feat(dasd_rules): remove dasd handling consolidated in s390-tools 8d6098969aa9dc34edfd1bc96e6aa0384ae2fb99 feat(zfcp): minimize zfcp handling consolidated in s390-tools 71876ea8c73090741bdf26abb89c28fb260ed575 feat(zfcp_rules): remove zfcp handling consolidated in s390-tools a2c1fc530d8bcbdeaf1806f4a22019052715fc98 refactor(cms): remove now unnecessary inclusion of full s390utils-base cc14fe218861f2855ca88ad03220ecb78d4aa31a refactor(cms): use consolidated network config with zdev from s390-tools 74edb9758da26ef063e4686a595f1d34f07f86f7 refactor(cms): use consolidated dasd config with zdev from s390-tools 3a9b9a5cf507a868f8b3ec33cf686b3a552286c2 refactor(cms): use consolidated zfcp config with zdev from s390-tools 38412977daad049b12273966300d07211674834e refactor(cms): use zdev to simplify handling CMSDASD=... boot option (Possibly also resolves other open issues.) Resolves: RHEL-26887 RHEL-34954 RHEL-35521
88 lines
3.0 KiB
Diff
88 lines
3.0 KiB
Diff
From 55a56c546bde71fb42c99aadd96e98fca2199823 Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Gombos <laszlo.gombos@gmail.com>
|
|
Date: Fri, 5 Apr 2024 15:50:20 +0200
|
|
Subject: [PATCH 19/23] fix(dracut): move hooks directory from /usr/lib to
|
|
/var/lib
|
|
|
|
Since https://github.com/systemd/systemd/commit/ffc1ec73, /usr is mounted as
|
|
read-only in the initramfs by default.
|
|
|
|
Fixes #2588
|
|
|
|
Co-authored-by: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
|
---
|
|
dracut-init.sh | 2 +-
|
|
dracut.sh | 6 +++++-
|
|
modules.d/99base/module-setup.sh | 5 ++++-
|
|
modules.d/99shutdown/module-setup.sh | 8 +++++---
|
|
4 files changed, 15 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/dracut-init.sh b/dracut-init.sh
|
|
index c37038e3..1c7ca58a 100755
|
|
--- a/dracut-init.sh
|
|
+++ b/dracut-init.sh
|
|
@@ -630,7 +630,7 @@ inst_hook() {
|
|
dfatal "No such hook type $1. Aborting initrd creation."
|
|
exit 1
|
|
fi
|
|
- hook="/lib/dracut/hooks/${1}/${2}-${3##*/}"
|
|
+ hook="/var/lib/dracut/hooks/${1}/${2}-${3##*/}"
|
|
inst_simple "$3" "$hook"
|
|
chmod u+x "$initdir/$hook"
|
|
}
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
index a0af3dd2..5d43f44c 100755
|
|
--- a/dracut.sh
|
|
+++ b/dracut.sh
|
|
@@ -1883,7 +1883,11 @@ mkdir -p "${initdir}"/lib/dracut
|
|
|
|
if [[ $kernel_only != yes ]]; then
|
|
mkdir -p "${initdir}/etc/cmdline.d"
|
|
- mkdir -m 0755 "${initdir}"/lib/dracut/hooks
|
|
+ mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks
|
|
+
|
|
+ # symlink to old hooks location for compatibility
|
|
+ ln_r /var/lib/dracut/hooks /lib/dracut/hooks
|
|
+
|
|
for _d in $hookdirs; do
|
|
# shellcheck disable=SC2174
|
|
mkdir -m 0755 -p "${initdir}/lib/dracut/hooks/$_d"
|
|
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
|
|
index 54b0deb9..bfdc51d4 100755
|
|
--- a/modules.d/99base/module-setup.sh
|
|
+++ b/modules.d/99base/module-setup.sh
|
|
@@ -45,7 +45,10 @@ install() {
|
|
|
|
[ -e "${initdir}/lib" ] || mkdir -m 0755 -p "${initdir}"/lib
|
|
mkdir -m 0755 -p "${initdir}"/lib/dracut
|
|
- mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks
|
|
+ mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks
|
|
+
|
|
+ # symlink to old hooks location for compatibility
|
|
+ ln_r /var/lib/dracut/hooks /lib/dracut/hooks
|
|
|
|
mkdir -p "${initdir}"/tmp
|
|
|
|
diff --git a/modules.d/99shutdown/module-setup.sh b/modules.d/99shutdown/module-setup.sh
|
|
index 2b999024..f53017ff 100755
|
|
--- a/modules.d/99shutdown/module-setup.sh
|
|
+++ b/modules.d/99shutdown/module-setup.sh
|
|
@@ -17,9 +17,11 @@ install() {
|
|
inst_multiple umount poweroff reboot halt losetup stat sleep timeout
|
|
inst_multiple -o kexec
|
|
inst "$moddir/shutdown.sh" "$prefix/shutdown"
|
|
- [ -e "${initdir}/lib" ] || mkdir -m 0755 -p "${initdir}"/lib
|
|
- mkdir -m 0755 -p "${initdir}"/lib/dracut
|
|
- mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks
|
|
+ mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks
|
|
+
|
|
+ # symlink to old hooks location for compatibility
|
|
+ ln_r /var/lib/dracut/hooks /lib/dracut/hooks
|
|
+
|
|
for _d in $hookdirs shutdown shutdown-emergency; do
|
|
mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks/"$_d"
|
|
done
|
|
--
|
|
2.42.0
|
|
|