From 8714280104f7764884f15a35c695a7f5e2624d1b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 16 Oct 2012 13:15:21 +0200 Subject: [PATCH] only install /etc/modprobe.d for hostonly --- modules.d/90kernel-modules/module-setup.sh | 4 ++-- modules.d/95nfs/module-setup.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh index ad2b7c18..4f37977b 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -69,8 +69,8 @@ installkernel() { } install() { - [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf - dracut_install -o /{etc,lib}/modprobe.d/*.conf + dracut_install -o /lib/modprobe.d/*.conf + [[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf inst_hook cmdline 01 "$moddir/parse-kernel.sh" inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh } diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh index 1bba871d..3ddf1868 100755 --- a/modules.d/95nfs/module-setup.sh +++ b/modules.d/95nfs/module-setup.sh @@ -38,6 +38,7 @@ install() { if [ -f /lib/modprobe.d/nfs.conf ]; then dracut_install /lib/modprobe.d/nfs.conf else + [ -d $initdir/etc/modprobe.d/ ] || mkdir $initdir/etc/modprobe.d echo "alias nfs4 nfs" > $initdir/etc/modprobe.d/nfs.conf fi