[PR PATCH] dracut: update to 059

[PR PATCH] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is a new pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 3358 bytes --]

From dbe6e5b139448a2f122583a71dfa6537b9135270 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ---------------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ---------------
 srcpkgs/dracut/template                      | 11 +++++------
 3 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..055dbe1e3d58 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,8 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -12,9 +11,9 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.xz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 3358 bytes --]

From 5599f3969b14b556ee81103f8dc6fad77e57ccf8 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ---------------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ---------------
 srcpkgs/dracut/template                      | 11 +++++------
 3 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..4b72ad844f7e 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,8 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -12,9 +11,9 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 4794 bytes --]

From 5f5be708efe15897f0d39f9d1c4208d203786b2d Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++++++------
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ----------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ----------
 srcpkgs/dracut/template                      | 11 ++++---
 4 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..4b72ad844f7e 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,8 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -12,9 +11,9 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 4877 bytes --]

From 1feae5fabd3c97a845f67e3b0d01b1da2c44df79 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++++++------
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ----------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ----------
 srcpkgs/dracut/template                      | 13 ++++----
 4 files changed, 28 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..fdd2c6e13ca7 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,19 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
 hostmakedepends="pkg-config"
-makedepends="libkmod-devel"
+makedepends="libkmod-devel asciidoc"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 4878 bytes --]

From b1fdddf321489172fdfb23d6679bac04af571b2d Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++++++------
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ----------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ----------
 srcpkgs/dracut/template                      | 13 ++++----
 4 files changed, 28 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..3ba78d34a22d 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,19 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387123278

Comment:
@zdykstra @motorto - Would you be able to help and test this version bump for dracut ? 

It is quite a significant upgrade from 053 to 059. Gentoo and Alpine has been on 059 for a while now.

Re: dracut: update to 059

[motorto]

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387244971

Comment:
Definitely,  could you please add `changelog=https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md` to the template as well.

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 4959 bytes --]

From 3765d41987086f57a003060a0278ec703292c771 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++++++------
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ----------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ----------
 srcpkgs/dracut/template                      | 14 ++++-----
 4 files changed, 29 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..edfa35f48b97 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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

Re: dracut: update to 059

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 942 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387422613

Comment:
The first issue I've noticed is that the Dracut version seems to be unset in `/lib/initrd-release` inside a generated initramfs:

```
NAME="Void"
ID="void"
HOME_URL="https://voidlinux.org/"
DOCUMENTATION_URL="https://docs.voidlinux.org/"
LOGO="void-logo"
ANSI_COLOR="0;38;2;71;128;97"

DISTRIB_ID="void"
VERSION="dracut-"
PRETTY_NAME="Void Linux dracut- (Initramfs)"
DRACUT_VERSION=""
```

Looking through `/usr/lib/dracut` on my system, I see that `/usr/lib/dracut/dracut-version.sh` has:

```
#!/bin/sh
# shellcheck disable=SC2034
DRACUT_VERSION=
```

Nothing sources that file that I can see. Grepping through all of `/usr/lib/dracut` for `DRACUT_VERSION` shows it being used, but never initialized. `dracut --version` outputs:

```
# dracut --version
dracut 
```

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 5204 bytes --]

From 280a9e618c77aaee899df9e754591b7f2c79826f Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++++++------
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ----------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ----------
 srcpkgs/dracut/template                      | 15 +++++-----
 4 files changed, 30 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..5e99abff15a9 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,7 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+	echo "DRACUT_VERSION=%{version}-%{revision}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
 }
 
 dracut-network_package() {

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387449855

Comment:
> The first issue I've noticed is that the Dracut version seems to be unset in `/lib/initrd-release` inside a generated initramfs:

Thanks @zdykstra . Great catch. I pushed a speculative fix - similar to what other disto packaging also have. It looks to me that this is not a regression and 053 perhaps had the same issue.

Re: dracut: update to 059

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387454756

Comment:
> > The first issue I've noticed is that the Dracut version seems to be unset in `/lib/initrd-release` inside a generated initramfs:
> 
> Thanks @zdykstra . Great catch. I pushed a speculative fix - similar to what other disto packaging also have. It looks to me that this is not a regression and 053 perhaps had the same issue.

The current Void Dracut package seems to set that correctly;

```
cat /usr/lib/dracut/dracut-version.sh 
DRACUT_VERSION=053
```

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 3691 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387485305

Comment:
just built dracut from this branch, it does not work with [mklive](https://github.com/void-linux/void-mklive).

```
$ make
...
$ doas ./build-x86-images.sh -a x86_64 -b xfce -r ~/void/packages/hostdir/binpkgs/LaszloGombos/master/
...
[5/9] Generating initramfs image (xz)...
dracut: Executing: /usr/bin/dracut -N --xz --add-drivers ahci --force-add "vmklive autoinstaller" --omit systemd /boot/initrd 6.1.6_1
dracut: dracut module 'mksh' will not be installed, because command 'mksh' could not be found!
dracut: dracut module 'network' depends on 'network-manager', which can't be installed
dracut: dracut module 'autoinstaller' depends on 'network', which can't be installed
dracut: dracut module 'modsign' will not be installed, because command 'keyctl' could not be found!
dracut: dracut module 'busybox' will not be installed, because command 'busybox' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmanctl' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand-wait-online' could not be found!
dracut: dracut module 'url-lib' will not be installed, because command 'curl' could not be found!
dracut: 62bluetooth: Could not find any command of '/usr/lib/bluetooth/bluetoothd /usr/libexec/bluetooth/bluetoothd'!
dracut: dracut module 'dmsquash-live-ntfs' will not be installed, because command 'ntfs-3g' could not be found!
dracut: dracut module 'multipath' will not be installed, because command 'multipath' could not be found!
dracut: dracut module 'pcsc' will not be installed, because command 'pcscd' could not be found!
dracut: dracut module 'tpm2-tss' will not be installed, because command 'tpm2' could not be found!
dracut: dracut module 'cifs' will not be installed, because command 'mount.cifs' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoemon' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoeadm' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsi-iname' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsiadm' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsid' could not be found!
dracut: dracut module 'nbd' will not be installed, because command 'nbd-client' could not be found!
dracut: 95nfs: Could not find any command of 'rpcbind portmap'!
dracut: dracut module 'nvmf' will not be installed, because command 'nvme' could not be found!
dracut: dracut module 'biosdevname' will not be installed, because command 'biosdevname' could not be found!
dracut: dracut module 'autoinstaller' cannot be found or installed.
ERROR: Failed to generate the initramfs
```

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 3798 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387485305

Comment:
just built dracut from this branch, it does not work with [mklive](https://github.com/void-linux/void-mklive).

```
$ make
...
$ doas ./build-x86-images.sh -a x86_64 -b xfce -r ~/void/packages/hostdir/binpkgs/LaszloGombos/master/
...
[5/9] Generating initramfs image (xz)...
dracut: Executing: /usr/bin/dracut -N --xz --add-drivers ahci --force-add "vmklive autoinstaller" --omit systemd /boot/initrd 6.1.6_1
dracut: dracut module 'mksh' will not be installed, because command 'mksh' could not be found!
dracut: dracut module 'network' depends on 'network-manager', which can't be installed
dracut: dracut module 'autoinstaller' depends on 'network', which can't be installed
dracut: dracut module 'modsign' will not be installed, because command 'keyctl' could not be found!
dracut: dracut module 'busybox' will not be installed, because command 'busybox' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmanctl' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand-wait-online' could not be found!
dracut: dracut module 'url-lib' will not be installed, because command 'curl' could not be found!
dracut: 62bluetooth: Could not find any command of '/usr/lib/bluetooth/bluetoothd /usr/libexec/bluetooth/bluetoothd'!
dracut: dracut module 'dmsquash-live-ntfs' will not be installed, because command 'ntfs-3g' could not be found!
dracut: dracut module 'multipath' will not be installed, because command 'multipath' could not be found!
dracut: dracut module 'pcsc' will not be installed, because command 'pcscd' could not be found!
dracut: dracut module 'tpm2-tss' will not be installed, because command 'tpm2' could not be found!
dracut: dracut module 'cifs' will not be installed, because command 'mount.cifs' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoemon' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoeadm' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsi-iname' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsiadm' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsid' could not be found!
dracut: dracut module 'nbd' will not be installed, because command 'nbd-client' could not be found!
dracut: 95nfs: Could not find any command of 'rpcbind portmap'!
dracut: dracut module 'nvmf' will not be installed, because command 'nvme' could not be found!
dracut: dracut module 'biosdevname' will not be installed, because command 'biosdevname' could not be found!
dracut: dracut module 'autoinstaller' cannot be found or installed.
ERROR: Failed to generate the initramfs
```
autoinstaller is found [here](https://github.com/void-linux/void-mklive/tree/master/dracut/autoinstaller)

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 3797 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387485305

Comment:
just built dracut from this branch, it does not work with [mklive](https://github.com/void-linux/void-mklive).

```
$ make
...
$ doas ./build-x86-images.sh -a x86_64 -b xfce -r ~/void/packages/hostdir/binpkgs/LaszloGombos/master/
...
[5/9] Generating initramfs image (xz)...
dracut: Executing: /usr/bin/dracut -N --xz --add-drivers ahci --force-add "vmklive autoinstaller" --omit systemd /boot/initrd 6.1.6_1
dracut: dracut module 'mksh' will not be installed, because command 'mksh' could not be found!
dracut: dracut module 'network' depends on 'network-manager', which can't be installed
dracut: dracut module 'autoinstaller' depends on 'network', which can't be installed
dracut: dracut module 'modsign' will not be installed, because command 'keyctl' could not be found!
dracut: dracut module 'busybox' will not be installed, because command 'busybox' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmanctl' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand-wait-online' could not be found!
dracut: dracut module 'url-lib' will not be installed, because command 'curl' could not be found!
dracut: 62bluetooth: Could not find any command of '/usr/lib/bluetooth/bluetoothd /usr/libexec/bluetooth/bluetoothd'!
dracut: dracut module 'dmsquash-live-ntfs' will not be installed, because command 'ntfs-3g' could not be found!
dracut: dracut module 'multipath' will not be installed, because command 'multipath' could not be found!
dracut: dracut module 'pcsc' will not be installed, because command 'pcscd' could not be found!
dracut: dracut module 'tpm2-tss' will not be installed, because command 'tpm2' could not be found!
dracut: dracut module 'cifs' will not be installed, because command 'mount.cifs' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoemon' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoeadm' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsi-iname' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsiadm' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsid' could not be found!
dracut: dracut module 'nbd' will not be installed, because command 'nbd-client' could not be found!
dracut: 95nfs: Could not find any command of 'rpcbind portmap'!
dracut: dracut module 'nvmf' will not be installed, because command 'nvme' could not be found!
dracut: dracut module 'biosdevname' will not be installed, because command 'biosdevname' could not be found!
dracut: dracut module 'autoinstaller' cannot be found or installed.
ERROR: Failed to generate the initramfs
```
autoinstaller is from [here](https://github.com/void-linux/void-mklive/tree/master/dracut/autoinstaller)

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 4082 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387485305

Comment:
just built dracut from this branch, it does not work with [mklive](https://github.com/void-linux/void-mklive).

```
$ make
...
$ doas ./build-x86-images.sh -a x86_64 -b xfce -r ~/void/packages/hostdir/binpkgs/LaszloGombos/master/
...
[5/9] Generating initramfs image (xz)...
dracut: Executing: /usr/bin/dracut -N --xz --add-drivers ahci --force-add "vmklive autoinstaller" --omit systemd /boot/initrd 6.1.6_1
dracut: dracut module 'mksh' will not be installed, because command 'mksh' could not be found!
dracut: dracut module 'network' depends on 'network-manager', which can't be installed
dracut: dracut module 'autoinstaller' depends on 'network', which can't be installed
dracut: dracut module 'modsign' will not be installed, because command 'keyctl' could not be found!
dracut: dracut module 'busybox' will not be installed, because command 'busybox' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmanctl' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand-wait-online' could not be found!
dracut: dracut module 'url-lib' will not be installed, because command 'curl' could not be found!
dracut: 62bluetooth: Could not find any command of '/usr/lib/bluetooth/bluetoothd /usr/libexec/bluetooth/bluetoothd'!
dracut: dracut module 'dmsquash-live-ntfs' will not be installed, because command 'ntfs-3g' could not be found!
dracut: dracut module 'multipath' will not be installed, because command 'multipath' could not be found!
dracut: dracut module 'pcsc' will not be installed, because command 'pcscd' could not be found!
dracut: dracut module 'tpm2-tss' will not be installed, because command 'tpm2' could not be found!
dracut: dracut module 'cifs' will not be installed, because command 'mount.cifs' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoemon' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoeadm' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsi-iname' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsiadm' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsid' could not be found!
dracut: dracut module 'nbd' will not be installed, because command 'nbd-client' could not be found!
dracut: 95nfs: Could not find any command of 'rpcbind portmap'!
dracut: dracut module 'nvmf' will not be installed, because command 'nvme' could not be found!
dracut: dracut module 'biosdevname' will not be installed, because command 'biosdevname' could not be found!
dracut: dracut module 'autoinstaller' cannot be found or installed.
ERROR: Failed to generate the initramfs
```
autoinstaller is from [here](https://github.com/void-linux/void-mklive/tree/master/dracut/autoinstaller)

relevant lines appear to be:
```
dracut: dracut module 'network' depends on 'network-manager', which can't be installed
dracut: dracut module 'autoinstaller' depends on 'network', which can't be installed
dracut: dracut module 'autoinstaller' cannot be found or installed.
```

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 4092 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387485305

Comment:
just built dracut from this branch, it does not work with [mklive](https://github.com/void-linux/void-mklive).

```
$ make
...
$ doas ./build-x86-images.sh -a x86_64 -b xfce -r ~/void/packages/hostdir/binpkgs/LaszloGombos/master/
...
[5/9] Generating initramfs image (xz)...
dracut: Executing: /usr/bin/dracut -N --xz --add-drivers ahci --force-add "vmklive autoinstaller" --omit systemd /boot/initrd 6.1.6_1
dracut: dracut module 'mksh' will not be installed, because command 'mksh' could not be found!
dracut: dracut module 'network' depends on 'network-manager', which can't be installed
dracut: dracut module 'autoinstaller' depends on 'network', which can't be installed
dracut: dracut module 'modsign' will not be installed, because command 'keyctl' could not be found!
dracut: dracut module 'busybox' will not be installed, because command 'busybox' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmanctl' could not be found!
dracut: dracut module 'connman' will not be installed, because command 'connmand-wait-online' could not be found!
dracut: dracut module 'url-lib' will not be installed, because command 'curl' could not be found!
dracut: 62bluetooth: Could not find any command of '/usr/lib/bluetooth/bluetoothd /usr/libexec/bluetooth/bluetoothd'!
dracut: dracut module 'dmsquash-live-ntfs' will not be installed, because command 'ntfs-3g' could not be found!
dracut: dracut module 'multipath' will not be installed, because command 'multipath' could not be found!
dracut: dracut module 'pcsc' will not be installed, because command 'pcscd' could not be found!
dracut: dracut module 'tpm2-tss' will not be installed, because command 'tpm2' could not be found!
dracut: dracut module 'cifs' will not be installed, because command 'mount.cifs' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoemon' could not be found!
dracut: dracut module 'fcoe' will not be installed, because command 'fcoeadm' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'dcbtool' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'fipvlan' could not be found!
dracut: dracut module 'fcoe-uefi' will not be installed, because command 'lldpad' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsi-iname' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsiadm' could not be found!
dracut: dracut module 'iscsi' will not be installed, because command 'iscsid' could not be found!
dracut: dracut module 'nbd' will not be installed, because command 'nbd-client' could not be found!
dracut: 95nfs: Could not find any command of 'rpcbind portmap'!
dracut: dracut module 'nvmf' will not be installed, because command 'nvme' could not be found!
dracut: dracut module 'biosdevname' will not be installed, because command 'biosdevname' could not be found!
dracut: dracut module 'autoinstaller' cannot be found or installed.
ERROR: Failed to generate the initramfs
```
autoinstaller is from [here](https://github.com/void-linux/void-mklive/tree/master/dracut/autoinstaller)

relevant lines appear to be:
```
...
dracut: dracut module 'network' depends on 'network-manager', which can't be installed
dracut: dracut module 'autoinstaller' depends on 'network', which can't be installed
...
dracut: dracut module 'autoinstaller' cannot be found or installed.
```

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387494307

Comment:
ok, this also happens with the current dracut so it's probably caused by #41031 

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387530735

Comment:
@classabbyamp . Thank you and sorry about this.

I think void also need to carry this patch that I added to Gentoo - https://github.com/gentoo/gentoo/pull/28777/files .

Will try to find some time to upload an independent PR from the version bump, unless someone beats me to it.

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387530735

Comment:
@classabbyamp . Thank you and sorry about this.

I think Void also need to carry this patch that I added to Gentoo - https://github.com/gentoo/gentoo/pull/28777/files .

Will try to find some time to upload an independent PR from the version bump, unless someone beats me to it.

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387530735

Comment:
@classabbyamp . Thank you and sorry about this.

I think Void also need to carry this patch that I added to Gentoo - https://github.com/gentoo/gentoo/pull/28777/files .

PR for this - https://github.com/void-linux/void-packages/pull/41720 

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387530735

Comment:
@classabbyamp . Thank you and sorry about this.

Fix for regression landed - https://github.com/void-linux/void-packages/pull/41721/commits/1c03835df985d95a296b257934a1256a85582104

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387530735

Comment:
@classabbyamp . Thank you and sorry about this.

Fix for regression - https://github.com/void-linux/void-packages/pull/41720

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 5204 bytes --]

From a3f8b4b4f53166824bcb8c05bd0597657e5cde2a Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++++++------
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ----------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ----------
 srcpkgs/dracut/template                      | 15 +++++-----
 4 files changed, 30 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..5e99abff15a9 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,7 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+	echo "DRACUT_VERSION=%{version}-%{revision}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
 }
 
 dracut-network_package() {

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1387530735

Comment:
@classabbyamp . Thank you and sorry about this.

Fix for regression for v53 - https://github.com/void-linux/void-packages/pull/41720

Network module fix patch also ported over here for the 059 update.

Re: dracut: update to 059

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1396105079

Comment:
Since this is an orphaned package and I have both Void and Dracut experience, I'm willing to be listed as the maintainer of this package.  If that's okay with people, feel free to set the maintainer field to `Zach Dykstra <dykstra.zachary@gmail.com>`

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 5260 bytes --]

From cd1dd39011c94ff7d6c78a42d6286360079a1850 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++++++------
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ----------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ----------
 srcpkgs/dracut/template                      | 17 ++++++-----
 4 files changed, 31 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..91f62ae000d0 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,7 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+	echo "DRACUT_VERSION=%{version}-%{revision}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
 }
 
 dracut-network_package() {

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1396117635

Comment:
>  If that's okay with people, feel free to set the maintainer field to `Zach Dykstra <dykstra.zachary@gmail.com>`

Added this change to the PR. Thank you very much !

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1396117635

Comment:
>  If that's okay with people, feel free to set the maintainer field to `Zach Dykstra <dykstra.zachary@gmail.com>`

Added the change of the maintainer to the PR. Thank you very much !

Re: dracut: update to 059

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1396265738

Comment:
Booted with dracut built from this PR's changes and it worked fine for me for what it's worth.

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 7353 bytes --]

From 0766ccec97e878377911d27bd14ff7e9cc5c046f Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 18 Jan 2023 13:29:38 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++++------
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 ---------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 ---------
 srcpkgs/dracut/patches/network.patch         | 34 ++++++++++++++++++++
 srcpkgs/dracut/template                      | 17 +++++-----
 5 files changed, 65 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch
 create mode 100644 srcpkgs/dracut/patches/network.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
new file mode 100644
index 000000000000..ba8f9d23c4c3
--- /dev/null
+++ b/srcpkgs/dracut/patches/network.patch
@@ -0,0 +1,34 @@
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+Date: Wed, 18 Jan 2023 19:59:24 +0000
+Subject: [PATCH] meta module should check if module exists
+
+Bug: https://github.com/dracutdevs/dracut/issues/1756
+---
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
+index ba7104d9..8f9e5bff 100755
+--- a/modules.d/40network/module-setup.sh
++++ b/modules.d/40network/module-setup.sh
+@@ -17,13 +17,13 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
+             network_handler="network-legacy"
+         fi
+     fi
+--
+2.34.1
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index f490f37b3cf0..91f62ae000d0 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=6
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,7 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+	echo "DRACUT_VERSION=%{version}-%{revision}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
 }
 
 dracut-network_package() {

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 6551 bytes --]

From d5fda9f82bf17ec851960751c95bbba320060a6c Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 19 Jan 2023 03:02:23 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch | 31 ++++++++++-----
 srcpkgs/dracut/patches/network.patch        | 44 +++++++++++----------
 srcpkgs/dracut/template                     | 17 ++++----
 3 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
index 09f08e327503..ba8f9d23c4c3 100644
--- a/srcpkgs/dracut/patches/network.patch
+++ b/srcpkgs/dracut/patches/network.patch
@@ -1,32 +1,34 @@
-From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
 From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 20:50:27 +0000
+Date: Wed, 18 Jan 2023 19:59:24 +0000
 Subject: [PATCH] meta module should check if module exists
 
 Bug: https://github.com/dracutdevs/dracut/issues/1756
 ---
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index d30f496..a69978c 100755
+index ba7104d9..8f9e5bff 100755
 --- a/modules.d/40network/module-setup.sh
 +++ b/modules.d/40network/module-setup.sh
-@@ -17,11 +17,11 @@ depends() {
-         done;
- 
-         if [ -z "$network_handler" ]; then
--            if find_binary wicked  &>/dev/null ; then
-+            if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked  &>/dev/null ; then
-                 network_handler="network-wicked"
--            elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-+            elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-                 network_handler="network-manager"
--            else
-+            elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-                 network_handler="network-legacy"
-             fi
+@@ -17,13 +17,13 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
+             network_handler="network-legacy"
          fi
--- 
+     fi
+--
 2.34.1
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 63153c5fe0bd..91f62ae000d0 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=7
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,7 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+	echo "DRACUT_VERSION=%{version}-%{revision}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
 }
 
 dracut-network_package() {

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 8300 bytes --]

From b811346615608de188d993c7b23dab144c31a068 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 19 Jan 2023 03:02:23 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 ++++++++++----
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 -------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 -------
 srcpkgs/dracut/patches/network.patch         | 44 ++++++++++----------
 srcpkgs/dracut/template                      | 17 ++++----
 5 files changed, 54 insertions(+), 68 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
index 09f08e327503..ba8f9d23c4c3 100644
--- a/srcpkgs/dracut/patches/network.patch
+++ b/srcpkgs/dracut/patches/network.patch
@@ -1,32 +1,34 @@
-From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
 From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 20:50:27 +0000
+Date: Wed, 18 Jan 2023 19:59:24 +0000
 Subject: [PATCH] meta module should check if module exists
 
 Bug: https://github.com/dracutdevs/dracut/issues/1756
 ---
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index d30f496..a69978c 100755
+index ba7104d9..8f9e5bff 100755
 --- a/modules.d/40network/module-setup.sh
 +++ b/modules.d/40network/module-setup.sh
-@@ -17,11 +17,11 @@ depends() {
-         done;
- 
-         if [ -z "$network_handler" ]; then
--            if find_binary wicked  &>/dev/null ; then
-+            if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked  &>/dev/null ; then
-                 network_handler="network-wicked"
--            elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-+            elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-                 network_handler="network-manager"
--            else
-+            elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-                 network_handler="network-legacy"
-             fi
+@@ -17,13 +17,13 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
+             network_handler="network-legacy"
          fi
--- 
+     fi
+--
 2.34.1
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 63153c5fe0bd..91f62ae000d0 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=7
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,7 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+	echo "DRACUT_VERSION=%{version}-%{revision}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
 }
 
 dracut-network_package() {

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 8566 bytes --]

From 501a11a3ab51b632c9c43132266b92a007b1afff Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 19 Jan 2023 03:02:23 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 +++++++++----
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 -------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 -------
 srcpkgs/dracut/patches/network.patch         | 47 +++++++++++---------
 srcpkgs/dracut/template                      | 17 +++----
 5 files changed, 57 insertions(+), 68 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
index 09f08e327503..d438f83b95fe 100644
--- a/srcpkgs/dracut/patches/network.patch
+++ b/srcpkgs/dracut/patches/network.patch
@@ -1,32 +1,37 @@
-From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
 From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 20:50:27 +0000
+Date: Wed, 18 Jan 2023 19:59:24 +0000
 Subject: [PATCH] meta module should check if module exists
 
 Bug: https://github.com/dracutdevs/dracut/issues/1756
 ---
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index d30f496..a69978c 100755
+index 1ab13ef..078cb4b 100755
 --- a/modules.d/40network/module-setup.sh
 +++ b/modules.d/40network/module-setup.sh
-@@ -17,11 +17,11 @@ depends() {
-         done;
- 
-         if [ -z "$network_handler" ]; then
--            if find_binary wicked  &>/dev/null ; then
-+            if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked  &>/dev/null ; then
-                 network_handler="network-wicked"
--            elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-+            elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-                 network_handler="network-manager"
--            else
-+            elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-                 network_handler="network-legacy"
-             fi
+@@ -17,15 +17,15 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
+             network_handler="network-wicked"
+-        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]
+             network_handler="network-legacy"
          fi
--- 
+     fi
+--
 2.34.1
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 63153c5fe0bd..91f62ae000d0 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=7
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,7 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+	echo "DRACUT_VERSION=%{version}-%{revision}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
 }
 
 dracut-network_package() {

Re: [PR REVIEW] dracut: update to 059

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#discussion_r1080813479

Comment:
This seems more like an upstream release engineering task. The version ought to be encoded in `dracut-version.sh` in the source tarball. Is the official expectation really that distribution packagers should be setting version information?

Re: [PR REVIEW] dracut: update to 059

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#discussion_r1080821121

Comment:
https://github.com/dracutdevs/dracut/issues/2169

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 8632 bytes --]

From 88c99502d17979f10f6fc535384509ab644a1bad Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 19 Jan 2023 03:02:23 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 +++++++++----
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 -------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 -------
 srcpkgs/dracut/patches/network.patch         | 47 +++++++++++---------
 srcpkgs/dracut/template                      | 20 +++++----
 5 files changed, 60 insertions(+), 68 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
index 09f08e327503..d438f83b95fe 100644
--- a/srcpkgs/dracut/patches/network.patch
+++ b/srcpkgs/dracut/patches/network.patch
@@ -1,32 +1,37 @@
-From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
 From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 20:50:27 +0000
+Date: Wed, 18 Jan 2023 19:59:24 +0000
 Subject: [PATCH] meta module should check if module exists
 
 Bug: https://github.com/dracutdevs/dracut/issues/1756
 ---
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index d30f496..a69978c 100755
+index 1ab13ef..078cb4b 100755
 --- a/modules.d/40network/module-setup.sh
 +++ b/modules.d/40network/module-setup.sh
-@@ -17,11 +17,11 @@ depends() {
-         done;
- 
-         if [ -z "$network_handler" ]; then
--            if find_binary wicked  &>/dev/null ; then
-+            if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked  &>/dev/null ; then
-                 network_handler="network-wicked"
--            elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-+            elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-                 network_handler="network-manager"
--            else
-+            elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-                 network_handler="network-legacy"
-             fi
+@@ -17,15 +17,15 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
+             network_handler="network-wicked"
+-        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]
+             network_handler="network-legacy"
          fi
--- 
+     fi
+--
 2.34.1
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 63153c5fe0bd..525d8b5bbe11 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=7
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,10 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+
+	if [[ ! -f ${DESTDIR}/usr/lib/dracut/dracut-version.sh ]] ; then
+		echo "DRACUT_VERSION=%{version}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
+	fi
 }
 
 dracut-network_package() {

Re: [PR REVIEW] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

New review comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#discussion_r1081607626

Comment:
given the upstream discussion (about future releases), I removed the revision number from the generated version anfd added a test for dracut-version.sh file to guard against overwritten the upstream version in the future.

Re: [PR PATCH] [Updated] dracut: update to 059

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 9697 bytes --]

From 88c99502d17979f10f6fc535384509ab644a1bad Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 19 Jan 2023 03:02:23 +0000
Subject: [PATCH 1/2] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 +++++++++----
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 -------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 -------
 srcpkgs/dracut/patches/network.patch         | 47 +++++++++++---------
 srcpkgs/dracut/template                      | 20 +++++----
 5 files changed, 60 insertions(+), 68 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
index 09f08e327503..d438f83b95fe 100644
--- a/srcpkgs/dracut/patches/network.patch
+++ b/srcpkgs/dracut/patches/network.patch
@@ -1,32 +1,37 @@
-From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
 From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 20:50:27 +0000
+Date: Wed, 18 Jan 2023 19:59:24 +0000
 Subject: [PATCH] meta module should check if module exists
 
 Bug: https://github.com/dracutdevs/dracut/issues/1756
 ---
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index d30f496..a69978c 100755
+index 1ab13ef..078cb4b 100755
 --- a/modules.d/40network/module-setup.sh
 +++ b/modules.d/40network/module-setup.sh
-@@ -17,11 +17,11 @@ depends() {
-         done;
- 
-         if [ -z "$network_handler" ]; then
--            if find_binary wicked  &>/dev/null ; then
-+            if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked  &>/dev/null ; then
-                 network_handler="network-wicked"
--            elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-+            elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-                 network_handler="network-manager"
--            else
-+            elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-                 network_handler="network-legacy"
-             fi
+@@ -17,15 +17,15 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
+             network_handler="network-wicked"
+-        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]
+             network_handler="network-legacy"
          fi
--- 
+     fi
+--
 2.34.1
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 63153c5fe0bd..525d8b5bbe11 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=7
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -61,6 +61,10 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
+
+	if [[ ! -f ${DESTDIR}/usr/lib/dracut/dracut-version.sh ]] ; then
+		echo "DRACUT_VERSION=%{version}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
+	fi
 }
 
 dracut-network_package() {

From ca17da8b89e645905832bb48a34cbe01e2611e4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 19 Jan 2023 13:00:33 -0500
Subject: [PATCH 2/2] fixup! dracut: update to 059

---
 srcpkgs/dracut/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 525d8b5bbe11..d706e9199316 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -37,6 +37,11 @@ case "$XBPS_TARGET_MACHINE" in
 	;;
 esac
 
+pre_build() {
+	# Upstream tarball is missing version information
+	DRACUT_VERSION="${version}" make dracut-version.sh
+}
+
 post_install() {
 	# kernel hooks.
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -61,10 +66,6 @@ post_install() {
 
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
-
-	if [[ ! -f ${DESTDIR}/usr/lib/dracut/dracut-version.sh ]] ; then
-		echo "DRACUT_VERSION=%{version}" > ${DESTDIR}/usr/lib/dracut/dracut-version.sh
-	fi
 }
 
 dracut-network_package() {

Re: [PR REVIEW] dracut: update to 059

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 655 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#discussion_r1081636950

Comment:
This doesn't work because the default Makefile target will create a `dracut-version.sh` with no version information, so the overwrite never happens. What seems to work is to define the template function

```bash
pre_build() {
    DRACUT_VERSION="${version}" make dracut-version.sh
}
```

that will force write the `dracut-version.sh` file before the package is built. I've pushed a fixup commit on your branch that makes this change. Please review and, if acceptable, squash the commits back down.l

Re: [PR REVIEW] dracut: update to 059

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 654 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#discussion_r1081636950

Comment:
This doesn't work because the default Makefile target will create a `dracut-version.sh` with no version information, so the overwrite never happens. What seems to work is to define the template function

```bash
pre_build() {
    DRACUT_VERSION="${version}" make dracut-version.sh
}
```

that will force write the `dracut-version.sh` file before the package is built. I've pushed a fixup commit on your branch that makes this change. Please review and, if acceptable, squash the commits back down.

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 8615 bytes --]

From 0613938708a526c8df23ad6a2b11a997169697c5 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 19 Jan 2023 03:02:23 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 +++++++++----
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 -------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 -------
 srcpkgs/dracut/patches/network.patch         | 47 +++++++++++---------
 srcpkgs/dracut/template                      | 21 +++++----
 5 files changed, 61 insertions(+), 68 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
index 09f08e327503..d438f83b95fe 100644
--- a/srcpkgs/dracut/patches/network.patch
+++ b/srcpkgs/dracut/patches/network.patch
@@ -1,32 +1,37 @@
-From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
 From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 20:50:27 +0000
+Date: Wed, 18 Jan 2023 19:59:24 +0000
 Subject: [PATCH] meta module should check if module exists
 
 Bug: https://github.com/dracutdevs/dracut/issues/1756
 ---
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index d30f496..a69978c 100755
+index 1ab13ef..078cb4b 100755
 --- a/modules.d/40network/module-setup.sh
 +++ b/modules.d/40network/module-setup.sh
-@@ -17,11 +17,11 @@ depends() {
-         done;
- 
-         if [ -z "$network_handler" ]; then
--            if find_binary wicked  &>/dev/null ; then
-+            if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked  &>/dev/null ; then
-                 network_handler="network-wicked"
--            elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-+            elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-                 network_handler="network-manager"
--            else
-+            elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-                 network_handler="network-legacy"
-             fi
+@@ -17,15 +17,15 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
+             network_handler="network-wicked"
+-        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]
+             network_handler="network-legacy"
          fi
--- 
+     fi
+--
 2.34.1
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 63153c5fe0bd..d706e9199316 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=7
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -37,6 +37,11 @@ case "$XBPS_TARGET_MACHINE" in
 	;;
 esac
 
+pre_build() {
+	# Upstream tarball is missing version information
+	DRACUT_VERSION="${version}" make dracut-version.sh
+}
+
 post_install() {
 	# kernel hooks.
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut

Re: [PR REVIEW] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New review comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#discussion_r1081748876

Comment:
Thanks, squashed. 

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1397541682

Comment:
looks like the new version of the network patch is causing an error:
```
[5/9] Generating initramfs image (xz)...
dracut: Executing: /usr/bin/dracut -N --xz --add-drivers ahci --force-add "vmklive autoinstaller" --omit systemd /boot/initrd 6.1.6_1
[...]
/usr/lib/dracut/modules.d/40network/module-setup.sh: line 30: syntax error near unexpected token `fi'
/usr/lib/dracut/modules.d/40network/module-setup.sh: line 30: `        fi'
/usr/lib/dracut/modules.d/40network/module-setup.sh: line 30: syntax error near unexpected token `fi'
/usr/lib/dracut/modules.d/40network/module-setup.sh: line 30: `        fi'
```

Re: [PR REVIEW] dracut: update to 059

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#discussion_r1081807930

Comment:
Missing `; then` here

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 8615 bytes --]

From 1da2c8fea4f6deaacb642b40dfa8d63bf988a09a Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 19 Jan 2023 03:02:23 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 +++++++++----
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 -------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 -------
 srcpkgs/dracut/patches/network.patch         | 47 +++++++++++---------
 srcpkgs/dracut/template                      | 21 +++++----
 5 files changed, 61 insertions(+), 68 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
index 09f08e327503..d438f83b95fe 100644
--- a/srcpkgs/dracut/patches/network.patch
+++ b/srcpkgs/dracut/patches/network.patch
@@ -1,32 +1,37 @@
-From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
 From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 20:50:27 +0000
+Date: Wed, 18 Jan 2023 19:59:24 +0000
 Subject: [PATCH] meta module should check if module exists
 
 Bug: https://github.com/dracutdevs/dracut/issues/1756
 ---
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index d30f496..a69978c 100755
+index 1ab13ef..078cb4b 100755
 --- a/modules.d/40network/module-setup.sh
 +++ b/modules.d/40network/module-setup.sh
-@@ -17,11 +17,11 @@ depends() {
-         done;
- 
-         if [ -z "$network_handler" ]; then
--            if find_binary wicked  &>/dev/null ; then
-+            if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked  &>/dev/null ; then
-                 network_handler="network-wicked"
--            elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-+            elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-                 network_handler="network-manager"
--            else
-+            elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-                 network_handler="network-legacy"
-             fi
+@@ -17,15 +17,15 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
+             network_handler="network-wicked"
+-        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]
+             network_handler="network-legacy"
          fi
--- 
+     fi
+--
 2.34.1
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 63153c5fe0bd..d706e9199316 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=7
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -37,6 +37,11 @@ case "$XBPS_TARGET_MACHINE" in
 	;;
 esac
 
+pre_build() {
+	# Upstream tarball is missing version information
+	DRACUT_VERSION="${version}" make dracut-version.sh
+}
+
 post_install() {
 	# kernel hooks.
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut

Re: [PR REVIEW] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New review comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#discussion_r1081830109

Comment:
My bad, pushed a new version. Thanks for testing !

Re: [PR PATCH] [Updated] dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41716

dracut: update to 059
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

A patch file from https://github.com/void-linux/void-packages/pull/41716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41716.patch --]
[-- Type: text/x-diff, Size: 8621 bytes --]

From e02d91e6f6f986913143a7feca848ab413d5179c Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 19 Jan 2023 03:02:23 +0000
Subject: [PATCH] dracut: update to 059

---
 srcpkgs/dracut/patches/force_poweroff.patch  | 31 +++++++++----
 srcpkgs/dracut/patches/kmod-fix.patch        | 15 -------
 srcpkgs/dracut/patches/musl-__wordsize.patch | 15 -------
 srcpkgs/dracut/patches/network.patch         | 47 +++++++++++---------
 srcpkgs/dracut/template                      | 21 +++++----
 5 files changed, 61 insertions(+), 68 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/kmod-fix.patch
 delete mode 100644 srcpkgs/dracut/patches/musl-__wordsize.patch

diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index 655746cc3745..9056685e32b9 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,17 +1,30 @@
+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
-@@ -1128,11 +1128,11 @@
- 
+@@ -1004,13 +1004,13 @@ emergency_shell() {
+
      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
diff --git a/srcpkgs/dracut/patches/kmod-fix.patch b/srcpkgs/dracut/patches/kmod-fix.patch
deleted file mode 100644
index fcde1eb76dc4..000000000000
--- a/srcpkgs/dracut/patches/kmod-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 
diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch
deleted file mode 100644
index 7a8b40a29034..000000000000
--- a/srcpkgs/dracut/patches/musl-__wordsize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-For musl libc it is required to include <sys/reg.h> to
-have __WORDSIZE defined to e.g. 32 for arm*-musl.
-
---- a/install/util.h	2015-06-15 12:27:21.000000000 +0200
-+++ b/install/util.h	2015-09-02 09:07:57.321104222 +0200
-@@ -33,6 +33,9 @@
- #include <signal.h>
- #include <sched.h>
- #include <limits.h>
-+#if !defined(__GLIBC__)
-+#include <sys/reg.h>
-+#endif
- #include <sys/stat.h>
- #include <dirent.h>
- #include <sys/resource.h>
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
index 09f08e327503..dce39fdc6f7a 100644
--- a/srcpkgs/dracut/patches/network.patch
+++ b/srcpkgs/dracut/patches/network.patch
@@ -1,32 +1,37 @@
-From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001
+From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
 From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 20:50:27 +0000
+Date: Wed, 18 Jan 2023 19:59:24 +0000
 Subject: [PATCH] meta module should check if module exists
 
 Bug: https://github.com/dracutdevs/dracut/issues/1756
 ---
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ modules.d/40network/module-setup.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index d30f496..a69978c 100755
+index 1ab13ef..078cb4b 100755
 --- a/modules.d/40network/module-setup.sh
 +++ b/modules.d/40network/module-setup.sh
-@@ -17,11 +17,11 @@ depends() {
-         done;
- 
-         if [ -z "$network_handler" ]; then
--            if find_binary wicked  &>/dev/null ; then
-+            if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked  &>/dev/null ; then
-                 network_handler="network-wicked"
--            elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-+            elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
-                 network_handler="network-manager"
--            else
-+            elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-                 network_handler="network-legacy"
-             fi
+@@ -17,15 +17,15 @@ depends() {
+     done
+
+     if [ -z "$network_handler" ]; then
+-        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
++        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
+             network_handler="network-wicked"
+-        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+             network_handler="connman"
+-        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
+             network_handler="network-manager"
+-        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
++        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
+             network_handler="systemd-networkd"
+-        else
++        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
+             network_handler="network-legacy"
          fi
--- 
+     fi
+--
 2.34.1
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 63153c5fe0bd..d706e9199316 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,20 @@
 # Template file for 'dracut'
 pkgname=dracut
-reverts="056_1"
-version=053
-revision=7
+version=059
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config asciidoc"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 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=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
+homepage="https://github.com/dracutdevs/dracut/wiki"
+changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
+distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
+checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
 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
@@ -37,6 +37,11 @@ case "$XBPS_TARGET_MACHINE" in
 	;;
 esac
 
+pre_build() {
+	# Upstream tarball is missing version information
+	DRACUT_VERSION="${version}" make dracut-version.sh
+}
+
 post_install() {
 	# kernel hooks.
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut

Re: dracut: update to 059

[motorto]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1399265210

Comment:
Sorry for the late reply, but tested now the generation of initramfs on my system and it worked properly, without any issue that I could notice.

@classabbyamp  could you test if the mklive doesn't have any issues now ?

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1399382717

Comment:
works with mklive :+1: 

Re: dracut: update to 059

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1399382717

Comment:
works with mklive :+1: 

![image](https://user-images.githubusercontent.com/5366828/213897180-c53cb525-158d-4588-a2d7-45b3616660f9.png)

Re: [PR PATCH] [Merged]: dracut: update to 059

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

There's a merged pull request on the void-packages repository

dracut: update to 059
https://github.com/void-linux/void-packages/pull/41716

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

I hope others from the community can help testing as well.

Re: dracut: update to 059

[LaszloGombos]

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1451136519

Comment:
Not a best place to ask, but I could not think of a better place. **I need help with the ifcfg dracut module.**

Can somebody help me understand how dracut on Void and handles networking. Specifically, as I understand both the network module and the  network-legacy meta module needs to be included, but what about the ifcfg dracut module ? 

**My hunch is that ifcfg is not useful for Void and perhaps should be remove** the same way as other dracut modules are removed here - https://github.com/void-linux/void-packages/blob/master/srcpkgs/dracut/template#L51 and I am hoping that somebody helps to confirm that (before regressing a working setup either upstream or for Void).

Re: dracut: update to 059

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/41716#issuecomment-1451141356

Comment:
`45ifcfg` doesn't seem to serve any purpose on Void that I can see. It looks to be entirely tied to RHEL-derived distributions.