From: Harald Hoyer <harald@redhat.com>
Date: Thu, 21 Feb 2013 09:55:52 +0000 (+0100)
Subject: systemd: add systemd-modules-load.service and hook dirs
X-Git-Tag: 026~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=569ffe77bf6651b4664a51d6ee03cb409fac8c06;p=thirdparty%2Fdracut.git

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 5c09fabff..db1f1b49e 100755
--- a/modules.d/98systemd/module-setup.sh
+++ b/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/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/*.conf
+
     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/*.conf
     else
         if ! [[ -e "$initdir/etc/machine-id" ]]; then
             > "$initdir/etc/machine-id"