diff --git a/srcpkgs/dracut/patches/modules-load.d.patch b/srcpkgs/dracut/patches/modules-load.d.patch deleted file mode 100644 index 0b691f5f8f..0000000000 --- a/srcpkgs/dracut/patches/modules-load.d.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 8b82fc7625b6e6715a1aa586441964b95ccfce1d -Author: Harald Hoyer -Date: Thu Feb 21 10:55:52 2013 +0100 - - systemd: add systemd-modules-load.service and hook dirs - -diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 5c09fab..3020763 100755 ---- modules.d/98systemd/module-setup.sh -+++ modules.d/98systemd/module-setup.sh -@@ -30,6 +30,7 @@ install() { - $systemdutildir/systemd-udevd \ - $systemdutildir/systemd-journald \ - $systemdutildir/systemd-sysctl \ -+ $systemdutildir/systemd-modules-load \ - $systemdsystemunitdir/emergency.target \ - $systemdsystemunitdir/sysinit.target \ - $systemdsystemunitdir/basic.target \ -@@ -57,6 +58,7 @@ install() { - $systemdsystemunitdir/systemd-ask-password-plymouth.path \ - $systemdsystemunitdir/systemd-journald.socket \ - $systemdsystemunitdir/systemd-ask-password-console.service \ -+ $systemdsystemunitdir/systemd-modules-load.service \ - $systemdsystemunitdir/emergency.service \ - $systemdsystemunitdir/halt.service \ - $systemdsystemunitdir/systemd-halt.service \ -@@ -81,6 +83,7 @@ install() { - $systemdsystemunitdir/sockets.target.wants/systemd-journald.socket \ - $systemdsystemunitdir/sysinit.target.wants/systemd-udevd.service \ - $systemdsystemunitdir/sysinit.target.wants/systemd-udev-trigger.service \ -+ $systemdsystemunitdir/sysinit.target.wants/systemd-modules-load.service \ - $systemdsystemunitdir/ctrl-alt-del.target \ - $systemdsystemunitdir/syslog.socket \ - $systemdsystemunitdir/syslog.target \ -@@ -89,13 +92,20 @@ install() { - $systemdsystemunitdir/umount.target \ - journalctl systemctl echo swapoff - -+ dracut_install -o \ -+ /usr/lib/modules-load.d/* -+ - if [[ $hostonly ]]; then -- dracut_install -o /etc/systemd/journald.conf \ -+ dracut_install -o \ -+ /etc/systemd/journald.conf \ - /etc/systemd/system.conf \ - /etc/hostname \ - /etc/machine-id \ - /etc/vconsole.conf \ - /etc/locale.conf -+ -+ dracut_install -o \ -+ /etc/modules-load.d/* - else - if ! [[ -e "$initdir/etc/machine-id" ]]; then - > "$initdir/etc/machine-id" diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index dbe1b6650f..f552b61a9f 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut -version=025 -revision=2 +version=026 +revision=1 build_style=gnu-makefile make_build_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system" make_install_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system" @@ -15,7 +15,7 @@ short_desc="A new initramfs infrastructure" maintainer="Juan RP " license="GPL-2" distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" -checksum=6851a6fc9e40cb2c5064049f27c1ebc389400e45a99cb69e5f357fd20b46b46c +checksum=8e18d9f2538c680476a380560f8a6268480559785303a5db107b2b54c49d3ec7 pre_build() { # Remove the nonsense syncheck target.