dracut: add patch to correctly use modules-load.d(5) in systemd modules.

This commit is contained in:
Juan RP 2013-02-21 11:04:14 +01:00
parent a377047453
commit 25c0b8905b
2 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,56 @@
commit 8b82fc7625b6e6715a1aa586441964b95ccfce1d
Author: Harald Hoyer <harald@redhat.com>
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"

View File

@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=025
revision=1
revision=2
build_style=gnu-makefile
make_build_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system"
make_install_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system"