From b0b0ccc5f2bcc13b084e7a4e534f8b33593e8d23 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 12 Dec 2022 21:59:35 +0000 Subject: [PATCH] dracut: version bump --- sys-kernel/dracut/Manifest | 11 ++++- ...cut-056-r2.ebuild => dracut-057-r2.ebuild} | 17 ++++---- .../dracut/files/055-add-blockfuncs.patch | 25 +++++++++++ ...o-not-quote-initargs-for-switch_root.patch | 32 ++++++++++++++ ...pt-remove-quotes-from-cryptsetupopts.patch | 39 +++++++++++++++++ ...-usrmount-do-not-empty-_dev-variable.patch | 36 ++++++++++++++++ .../dracut/files/055-tpm2-tss-typo.patch | 23 ++++++++++ .../dracut/files/057-i18n-keymaps.patch | 28 ++++++++++++ .../dracut/files/057-virtiofs-split-usr.patch | 43 +++++++++++++++++++ 9 files changed, 243 insertions(+), 11 deletions(-) rename sys-kernel/dracut/{dracut-056-r2.ebuild => dracut-057-r2.ebuild} (90%) create mode 100644 sys-kernel/dracut/files/055-add-blockfuncs.patch create mode 100644 sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch create mode 100644 sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch create mode 100644 sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch create mode 100644 sys-kernel/dracut/files/055-tpm2-tss-typo.patch create mode 100644 sys-kernel/dracut/files/057-i18n-keymaps.patch create mode 100644 sys-kernel/dracut/files/057-virtiofs-split-usr.patch diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 3f71de0..6215e35 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,7 +1,14 @@ +AUX 055-add-blockfuncs.patch 1301 BLAKE2B 412bbc63f0e961c27b4ac5576dc0d3605671becac60d742d238e1916b398ee7a146920d684a56e031088844065e9d37e4e8dbe5de370852b3edaeb7089c9e2ab SHA512 e4ea666b511fd51c8e91b284fae8bfab45180a1faff7fc8baeed3afe79e855bf27cb3434cfa4d6fd3eb6cfef685f8c13d02985580796bae75c4547713e2376e0 +AUX 055-fix-base-do-not-quote-initargs-for-switch_root.patch 1095 BLAKE2B 35e2fbc027db3c6e642939d2139a2ef22b7273d4a11e957fb9e6376b14b8ba26daf39281bb8494251b9940a54cd78b42c357f88bc7469a64307a936b62fc1ca1 SHA512 f59624deb66644e8488e15079d8dbfa1e428bdd325ecd3f879fd1f07869ca7aae001109dabd1816875aeeb5962c05496ce0e2261ee3562fa1800a5e4b61d446a +AUX 055-fix-crypt-remove-quotes-from-cryptsetupopts.patch 1404 BLAKE2B 4956f8df0b76c204279032fdf545f230f063fd7ea5393e3ade80587e10eb50dfba2e0677da04e641da17d1ce79564b3084274c739b3af59dab2226852b0835b2 SHA512 11243e311aeae6b9f1b6481521a92e4fd962e5fd24b1bd279e04f1f1618ba4ae0c4243d94274dda8e16d0311c377e0fbf2bae5c64c508e29caaf64d123c365a3 +AUX 055-fix-usrmount-do-not-empty-_dev-variable.patch 1358 BLAKE2B 9a0b5e698884eb4e333ff3d519245bbe7bb909247ff999edac7bfce4b37a384f7b6ab7d0a4ffc14d638c46b137430d44d50de41193f46ba799b070bd2031e138 SHA512 1d9d01a6df6c0d9e77e2b0e4ca0881e33abbf3430817416660122960575d428f832a64c6925a2588d56bd042a32a2a68da7cf173f62b4cd23e12ea2e1b49d588 +AUX 055-tpm2-tss-typo.patch 836 BLAKE2B 8a6382a9b979e23e54e4160e6492bfc588520b859b6305d7dca196ef22703229b2a95819e85f82ed8b5ed98408a8f154b2e9bd13878c41f01b91d2395dd83a56 SHA512 593093a63df073bd1f22d8f4242496fab9e13b74ac470123101ddbf9a781c1ad5c8edade5a2d8691b6708ff7d4f5b773f4a6beb7c100bc7683240ccd3ea0b10f AUX 056-fix-lvm-add-missing-grep-requirement.patch 1081 BLAKE2B 34f0e9e30e73d4809d6d44f7ce82a5544b7db1e227a3d501988234dd30bd6f022b4cf85f27dc5761112ca2ca96b45139255362f3b32d1d12d3b328a2c8cb50b7 SHA512 66cb1b81ee5320e88288cabb5b4cbde08cd309c184c4d1eb46127a7095f50736e500e9e66257f92e7cbe7e851a05fb7affc4f2dd793b72a614faf9cdf9606e1f AUX 056-musl.patch 845 BLAKE2B 5609cc74225907c90e2945a380b56720891e9fac1ffaa627ce58408bf2860a83e5a176e85d84cca994d1928730a1cf189dabe002d30c90e6764891590624df0e SHA512 d877c22078f2deed382002cdfb116f3985e65961cbd4c3e24f0f2c1696fbfdf7ecb5ccaab38e82659bc6037d44e24996bfb8b5d89cf7bc36bc46f8bbd495ed06 +AUX 057-i18n-keymaps.patch 1364 BLAKE2B 6805d459d7c6327b8f421a6853c6d1d91d29729231ff60a8dfc9a4fae1860cb385aec3c860079ad2e53af6c8d773be2e152422b1883a1e6be574c580cc9733e5 SHA512 818e59e7d2173b63c0b30eeeadcfb3f92409c8697d5581c77b9e5ba9669b585fc0cdad416dcc511da52ca0149a3abe7763d2654198763a6d08a1fbfce38295a9 +AUX 057-virtiofs-split-usr.patch 1556 BLAKE2B 292293bce43e899491001664c21d9fc2795d8e8221187c557fb9d74ab3fb7f91aa72d1bcd7c6750a834e7d8ebace27483f2c799353c9857adef2144fe7a5384a SHA512 a61cdfebcfaa9320af669c20589bb5c260c31c8d1cfd330751dbad6bea8e5b07f384ae43b4b9ab3390d233091872f38bbb11f23ec44e2c3fc6b263268d2ae56a AUX crypt-ssh-luks.patch 4280 BLAKE2B 28d9e5ff0ae5c75a959b16aa40af6dacdd2645b6336ced98318095f483af6d6d86ffe3781f1870d4b493e7590193a80bf4c2142b51dce986822669c62d9739b6 SHA512 7a12fe767950c77ca76e895fecfd7f6d29df9da9646a5f8d6f6e7112391cd6e11e8f081783a0a535a7c8d49842a7edc42b173c924f43ace457a66c721f1d377d AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f -DIST dracut-056.tar.xz 384196 BLAKE2B e3e4fa3024b401cc954ba6069c54e95912691ff68a838e3c43bfc6a5b284bdee1669c782b30503c0246b7146c545ee8825febefcff93bae76ec46067cb7b87e1 SHA512 19268763e128984d20cab766bbdf2de12fe534ce2562fc688203099ef9b4cf83d0ccd2129499c70cdc6dd4ad53f0ffc2f3378eff5b8a15fda27c23b20f903df2 -EBUILD dracut-056-r2.ebuild 4932 BLAKE2B 58c8899019a5674abf023e470773eb23230475d194f7319f614b77b6ba63a0c5f86f709f7b15081bf81fcb1f1979828991fdb1ef48a9f97accd84012656c814b SHA512 8e0cd2f0042a3a054762e41972eb317e19afa9af720f957cf9594cc7177ac45aa72e79cadf7f47f872d78f186ad7a03d20a39a252dfe949a68919514fec8cca8 +DIST dracut-057.tar.gz 481345 BLAKE2B dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901 SHA512 8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089 +EBUILD dracut-057-r2.ebuild 4856 BLAKE2B a7bac182b955c207a99554462f8fb52926f0db07688f4b017eec9adbd91963754caabbcf96b5e00bc96f224ca609c7671fdde206fc76708599704de941081f58 SHA512 93caf223be11bbb97f3c44c41838ed9e4f91c137b0b24a41d386c63430f1607e90003a207c79f949f2476924788fdd9af54f54fbf1457f50b0e7850b8980ea88 MISC metadata.xml 479 BLAKE2B 76b6d6da8d9ee65fac81f1a30999f3a095a9cbd8c91fbee63edaad61c0a429d5ba43f18979e10cd73ba6a87d89213397a9ee6621f61168c1bd461bb866c4f02b SHA512 e4b9f639c157b0104058c0e124be1d3d1f01e836e7182f0c8ec6852133ed36a52b5cfe0ec83142f185ad3f9b20192c719b83e2ee405b874420bb4e09ec01a38b diff --git a/sys-kernel/dracut/dracut-056-r2.ebuild b/sys-kernel/dracut/dracut-057-r2.ebuild similarity index 90% rename from sys-kernel/dracut/dracut-056-r2.ebuild rename to sys-kernel/dracut/dracut-057-r2.ebuild index a3f8e59..5610e29 100644 --- a/sys-kernel/dracut/dracut-056-r2.ebuild +++ b/sys-kernel/dracut/dracut-057-r2.ebuild @@ -9,13 +9,14 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/dracutdevs/dracut" else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" - SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" + if [[ "${PV}" != *_rc* ]]; then + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" + fi + SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" +HOMEPAGE="https://github.com/dracutdevs/dracut/wiki" LICENSE="GPL-2" SLOT="0" @@ -32,6 +33,7 @@ RDEPEND=" >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] + sys-apps/s6-linux-init[sysv-utils(-)] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig @@ -61,8 +63,8 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch - "${FILESDIR}"/056-musl.patch - "${FILESDIR}"/056-fix-lvm-add-missing-grep-requirement.patch + "${FILESDIR}"/057-virtiofs-split-usr.patch + "${FILESDIR}"/057-i18n-keymaps.patch "${FILESDIR}"/crypt-ssh-luks.patch ) @@ -144,9 +146,6 @@ pkg_postinst() { optfeature "Networking support" net-misc/networkmanager optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ sys-apps/iproute2 "net-misc/iputils[arping]" - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs optfeature "Load kernel modules and drop this privilege for real init" \ sys-libs/libcap diff --git a/sys-kernel/dracut/files/055-add-blockfuncs.patch b/sys-kernel/dracut/files/055-add-blockfuncs.patch new file mode 100644 index 0000000..56724e0 --- /dev/null +++ b/sys-kernel/dracut/files/055-add-blockfuncs.patch @@ -0,0 +1,25 @@ +From a91dcfeb54b8c6c810020f77124f6eaf6ef5baa9 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 12 Aug 2021 11:46:35 +0200 +Subject: [PATCH] fix(kernel-modules): add blk_mq_alloc_disk and + blk_cleanup_disk to blockfuncs + +Since kernel 5-14 those are used by many drivers for example: +xen-blkfront, loop, nbd, pd +--- + 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 8b06893ae..69dc18b59 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -2,7 +2,7 @@ + + # called by dracut + installkernel() { +- local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma' ++ local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma|blk_mq_alloc_disk|blk_cleanup_disk' + local -A _hostonly_drvs + + find_kernel_modules_external() { diff --git a/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch b/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch new file mode 100644 index 0000000..5568c22 --- /dev/null +++ b/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch @@ -0,0 +1,32 @@ +From 285e2ad01035743ff51005a74e486e09fcbb0a0d Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 23 Jul 2021 14:35:07 -0400 +Subject: [PATCH] fix(base): do not quote $initargs for switch_root + +We want word splitting to occur so that the arguments are passed +separately, and we don't end up passing an empty string if no arguments +are specified. + +Bug: https://bugs.gentoo.org/803548 +Fixes: 2fabaaa62dcfd31e593ca45e1374e55adae29d6b +--- + modules.d/99base/init.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh +index 978adb6f..ab62bb44 100755 +--- a/modules.d/99base/init.sh ++++ b/modules.d/99base/init.sh +@@ -387,7 +387,8 @@ if [ -f /etc/capsdrop ]; then + } + else + unset RD_DEBUG +- exec "$SWITCH_ROOT" "$NEWROOT" "$INIT" "$initargs" || { ++ # shellcheck disable=SC2086 ++ exec "$SWITCH_ROOT" "$NEWROOT" "$INIT" $initargs || { + warn "Something went very badly wrong in the initramfs. Please " + warn "file a bug against dracut." + emergency_shell +-- +2.32.0 + diff --git a/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch b/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch new file mode 100644 index 0000000..355cdc4 --- /dev/null +++ b/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch @@ -0,0 +1,39 @@ +From e0abf88a15d23fbf793cf872397016ad86aeaaa8 Mon Sep 17 00:00:00 2001 +From: lapseofreason +Date: Tue, 8 Jun 2021 16:01:58 +0200 +Subject: [PATCH] fix(crypt): remove quotes from cryptsetupopts + +Fixes #1528. +--- + modules.d/90crypt/cryptroot-ask.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh +index 37a4deea..b1f8df81 100755 +--- a/modules.d/90crypt/cryptroot-ask.sh ++++ b/modules.d/90crypt/cryptroot-ask.sh +@@ -138,8 +138,9 @@ unset allowdiscards + ask_passphrase=1 + + if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then ++ # shellcheck disable=SC2086 + if readkey "$luksfile" / "$device" \ +- | cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname"; then ++ | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname"; then + ask_passphrase=0 + fi + elif [ "$is_keysource" -ne 0 ]; then +@@ -164,8 +165,9 @@ else + unset tmp + + info "Using '$keypath' on '$keydev'" ++ # shellcheck disable=SC2086 + readkey "$keypath" "$keydev" "$device" \ +- | cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname" \ ++ | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname" \ + && ask_passphrase=0 + unset keypath keydev + break +-- +2.32.0 + diff --git a/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch b/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch new file mode 100644 index 0000000..e46f8bb --- /dev/null +++ b/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch @@ -0,0 +1,36 @@ +From 4afdcba212793f136aea012b30dd7bdb5b641a5a Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Mon, 16 Aug 2021 18:54:34 +0300 +Subject: [PATCH] fix(usrmount): do not empty _dev variable + +Currently $_dev is always overridden with the value returned by +label_uuid_to_dev(). This results in an empty value if $_dev is a +device path. Fix this by calling label_uuid_to_dev() conditionally. + +Bug: https://bugs.gentoo.org/807971 +Fixes: d3532978de04c78f53664dad7b37705a49a7ee54 +--- + modules.d/98usrmount/mount-usr.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh +index 23ed06aa..c8e1893b 100755 +--- a/modules.d/98usrmount/mount-usr.sh ++++ b/modules.d/98usrmount/mount-usr.sh +@@ -55,7 +55,12 @@ mount_usr() { + while read -r _dev _mp _fs _opts _freq _passno || [ -n "$_dev" ]; do + [ "${_dev%%#*}" != "$_dev" ] && continue + if [ "$_mp" = "/usr" ]; then +- _dev="$(label_uuid_to_dev "$_dev")" ++ case "$_dev" in ++ LABEL=* | UUID=* | PARTUUID=* | PARTLABEL=*) ++ _dev="$(label_uuid_to_dev "$_dev")" ++ ;; ++ *) ;; ++ esac + + if strstr "$_opts" "subvol=" \ + && [ "${root#block:}" -ef "$_dev" ] \ +-- +2.31.1 + diff --git a/sys-kernel/dracut/files/055-tpm2-tss-typo.patch b/sys-kernel/dracut/files/055-tpm2-tss-typo.patch new file mode 100644 index 0000000..a04496a --- /dev/null +++ b/sys-kernel/dracut/files/055-tpm2-tss-typo.patch @@ -0,0 +1,23 @@ +From 8b17105bed69ed90582a13d97d95ee19e6581365 Mon Sep 17 00:00:00 2001 +From: Matthias Berndt +Date: Tue, 1 Jun 2021 19:32:48 +0200 +Subject: [PATCH] fix(tpm2-tss): typo in depends() + +There is no systemd-udev module, only systemd-udevd +--- + modules.d/91tpm2-tss/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh +index 28af22a31..361131d66 100755 +--- a/modules.d/91tpm2-tss/module-setup.sh ++++ b/modules.d/91tpm2-tss/module-setup.sh +@@ -17,7 +17,7 @@ check() { + depends() { + + # This module has external dependency on other module(s). +- echo systemd-sysusers systemd-udev ++ echo systemd-sysusers systemd-udevd + # Return 0 to include the dependent module(s) in the initramfs. + return 0 + diff --git a/sys-kernel/dracut/files/057-i18n-keymaps.patch b/sys-kernel/dracut/files/057-i18n-keymaps.patch new file mode 100644 index 0000000..77ac607 --- /dev/null +++ b/sys-kernel/dracut/files/057-i18n-keymaps.patch @@ -0,0 +1,28 @@ +From bef99c5120809cc5603e51dcc1987767205f241f Mon Sep 17 00:00:00 2001 +From: Antonio Alvarez Feijoo +Date: Mon, 27 Jun 2022 13:19:41 +0200 +Subject: [PATCH] fix(i18n): add required includes for keymaps + +Commit https://github.com/dracutdevs/dracut/commit/f3441cc7 removed shell +options but didn't adapt all the code that requires nullglob and globstar. +This caused the initrd to be generated without the required includes for +keymaps. +--- + modules.d/10i18n/module-setup.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh +index 35bda36fb..6fd5fd433 100755 +--- a/modules.d/10i18n/module-setup.sh ++++ b/modules.d/10i18n/module-setup.sh +@@ -63,7 +63,9 @@ install() { + readarray -t INCLUDES < <("$CMD" '^include ' "$MAP" | while read -r _ a _ || [ -n "$a" ]; do echo "${a//\"/}"; done) + + for INCL in "${INCLUDES[@]}"; do +- for FN in "$dracutsysrootdir""${kbddir}"/keymaps/**/"$INCL"*; do ++ local -a FNS ++ mapfile -t -d '' FNS < <(find "${dracutsysrootdir}${kbddir}"/keymaps/ -type f -name "${INCL}*" -print0) ++ for FN in "${FNS[@]}"; do + [[ -f $FN ]] || continue + [[ -v KEYMAPS["$FN"] ]] || findkeymap "$FN" + done diff --git a/sys-kernel/dracut/files/057-virtiofs-split-usr.patch b/sys-kernel/dracut/files/057-virtiofs-split-usr.patch new file mode 100644 index 0000000..5bb51a9 --- /dev/null +++ b/sys-kernel/dracut/files/057-virtiofs-split-usr.patch @@ -0,0 +1,43 @@ +From dd63cc0a25f9fb34a2f28306c06a668d66564463 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Mon, 4 Jul 2022 19:08:45 -0400 +Subject: [PATCH] fix(virtiofs): make shebangs work on split-usr systems + +Fixes: c29325a982013a315418cdb2318e90cf77e387b5 +Signed-off-by: Mike Gilbert +--- + modules.d/95virtiofs/module-setup.sh | 2 +- + modules.d/95virtiofs/mount-virtiofs.sh | 2 +- + modules.d/95virtiofs/parse-virtiofs.sh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/modules.d/95virtiofs/module-setup.sh b/modules.d/95virtiofs/module-setup.sh +index e5f209e0a..70c10584a 100755 +--- a/modules.d/95virtiofs/module-setup.sh ++++ b/modules.d/95virtiofs/module-setup.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/bash ++#!/bin/bash + + # called by dracut + check() { +diff --git a/modules.d/95virtiofs/mount-virtiofs.sh b/modules.d/95virtiofs/mount-virtiofs.sh +index 507911cf5..c7e31d041 100755 +--- a/modules.d/95virtiofs/mount-virtiofs.sh ++++ b/modules.d/95virtiofs/mount-virtiofs.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/sh ++#!/bin/sh + + if [ "${fstype}" = "virtiofs" -o "${root%%:*}" = "virtiofs" ]; then + if ! { modprobe virtiofs || strstr "$(cat /proc/filesystems)" virtiofs; }; then +diff --git a/modules.d/95virtiofs/parse-virtiofs.sh b/modules.d/95virtiofs/parse-virtiofs.sh +index 8b8cf760d..760e41385 100755 +--- a/modules.d/95virtiofs/parse-virtiofs.sh ++++ b/modules.d/95virtiofs/parse-virtiofs.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/sh ++#!/bin/sh + # Accepted formats: + # rootfstype=virtiofs root= + # root=virtiofs: