kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check for systemd before installing systemd specific files 

https://bugzilla.redhat.com/show_bug.cgi?id=1282010
master
Harald Hoyer 2015-11-16 09:41:26 +01:00
parent 63a44c8dc3
commit 2da041d672
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dracut.sh
View File

@ -1481,6 +1481,7 @@ if [[ $kernel_only != yes ]]; then
cat "$f" >> "${initdir}/etc/fstab" cat "$f" >> "${initdir}/etc/fstab"
done done


if dracut_module_included "systemd"; then
if [ -d ${initdir}/$systemdutildir ]; then if [ -d ${initdir}/$systemdutildir ]; then
mkdir -p ${initdir}/etc/conf.d mkdir -p ${initdir}/etc/conf.d
{ {
@ -1489,6 +1490,7 @@ if [[ $kernel_only != yes ]]; then
printf "%s\n" "systemdsystemconfdir=\"$systemdsystemconfdir\"" printf "%s\n" "systemdsystemconfdir=\"$systemdsystemconfdir\""
} > ${initdir}/etc/conf.d/systemd.conf } > ${initdir}/etc/conf.d/systemd.conf
fi fi
fi


if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then
dinfo "*** Resolving executable dependencies ***" dinfo "*** Resolving executable dependencies ***"

3
modules.d/90crypt/module-setup.sh
View File

@ -86,6 +86,7 @@ install() {


inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh" inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"


if dracut_module_included "systemd"; then
inst_multiple -o \ inst_multiple -o \
$systemdutildir/system-generators/systemd-cryptsetup-generator \ $systemdutildir/system-generators/systemd-cryptsetup-generator \
$systemdutildir/systemd-cryptsetup \ $systemdutildir/systemd-cryptsetup \
@ -95,5 +96,7 @@ install() {
$systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \ $systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \
systemd-ask-password systemd-tty-ask-password-agent systemd-ask-password systemd-tty-ask-password-agent
inst_script "$moddir"/crypt-run-generator.sh /sbin/crypt-run-generator inst_script "$moddir"/crypt-run-generator.sh /sbin/crypt-run-generator
fi

dracut_need_initqueue dracut_need_initqueue
} }

2
modules.d/95udev-rules/module-setup.sh
View File

@ -56,8 +56,10 @@ install() {
# eudev rules # eudev rules
inst_rules 80-drivers-modprobe.rules inst_rules 80-drivers-modprobe.rules


if dracut_module_included "systemd"; then
inst_multiple -o ${systemdutildir}/network/*.link inst_multiple -o ${systemdutildir}/network/*.link
[[ $hostonly ]] && inst_multiple -H -o /etc/systemd/network/*.link [[ $hostonly ]] && inst_multiple -H -o /etc/systemd/network/*.link
fi


{ {
for i in cdrom tape dialout floppy; do for i in cdrom tape dialout floppy; do