-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This reverts commit 7def67b. dracut 056 causes a regression in live images because the network-manager hook depends on the systemd hook now (void-linux/void-mklive#296)
- Loading branch information
1 parent
4f32d12
commit a082809
Showing
5 changed files
with
31 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,17 @@ | ||
The shutdown binary is actually provided by runit and expects the runit | ||
init to be running. This is not the case in the initramfs. Forcing the | ||
shutdown, halt or reboot is necessary to ignore this requirement. | ||
|
||
--- | ||
modules.d/99base/dracut-lib.sh | 6 +++--- | ||
1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh | ||
--- a/modules.d/99base/dracut-lib.sh | ||
+++ b/modules.d/99base/dracut-lib.sh | ||
@@ -1004,13 +1004,13 @@ emergency_shell() { | ||
@@ -1128,11 +1128,11 @@ | ||
|
||
case "$_emergency_action" in | ||
reboot) | ||
- reboot || exit 1 | ||
+ reboot -f || exit 1 | ||
;; | ||
- reboot || exit 1;; | ||
+ reboot -f || exit 1;; | ||
poweroff) | ||
- poweroff || exit 1 | ||
+ poweroff -f || exit 1 | ||
;; | ||
- poweroff || exit 1;; | ||
+ poweroff -f || exit 1;; | ||
halt) | ||
- halt || exit 1 | ||
+ halt -f || exit 1 | ||
;; | ||
- halt || exit 1;; | ||
+ halt -f || exit 1;; | ||
esac | ||
} | ||
-- | ||
2.37.3 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
The depmod program from kmod>=30 looks for modules.builtin.modinfo and throws a | ||
warning when it isn't found. Newer versions of dracut pull in this file as well | ||
as modules.builtin.alias, so let's pull this in here and avoid the warning. | ||
|
||
--- a/dracut-init.sh | ||
+++ b/dracut-init.sh | ||
@@ -982,7 +982,7 @@ | ||
} | ||
|
||
dracut_kernel_post() { | ||
- for _f in modules.builtin.bin modules.builtin modules.order; do | ||
+ for _f in modules.builtin.{bin,alias,modinfo} modules.builtin modules.order; do | ||
[[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" | ||
done | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
# Template file for 'dracut' | ||
pkgname=dracut | ||
version=056 | ||
revision=1 | ||
reverts="056_1" | ||
version=053 | ||
revision=5 | ||
build_style=configure | ||
configure_args="--prefix=/usr --sysconfdir=/etc" | ||
conf_files="/etc/dracut.conf" | ||
|
@@ -13,13 +14,14 @@ maintainer="Orphaned <[email protected]>" | |
license="GPL-2.0-or-later, LGPL-2.0-or-later" | ||
homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html" | ||
distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz" | ||
checksum=e025bbdce9d1209640fb3f5f674f059c7e1f441537ba421703fe56055502421d | ||
checksum=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726 | ||
alternatives=" | ||
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst | ||
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm | ||
" | ||
subpackages="dracut-network" | ||
make_check=no # tests require root | ||
# Checks require distfiles come from a git repository | ||
make_check=no | ||
|
||
make_dirs=" | ||
/etc/dracut.conf.d 0755 root root | ||
|