modules.d/*/module-setup.sh: combine and specify type for installs

To speedup image creation, combine dracut_install calls and specify the exact type.
E.g. inst_script instead of the generic inst.

1 files changed, 4 insertions, 14 deletions

diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
index fb4dc9cc..b170de5f 100755
--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -31,21 +31,11 @@ installkernel() {
 install() {
     local _i
     local _nsslibs
-    type -P portmap >/dev/null && dracut_install portmap
-    type -P rpcbind >/dev/null && dracut_install rpcbind
+    dracut_install -o portmap rpcbind rpc.statd mount.nfs \
+        mount.nfs4 umount rpc.idmapd sed /etc/netconfig
+    dracut_install /etc/services /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf
 
-    dracut_install rpc.statd mount.nfs mount.nfs4 umount
-    [ -f /etc/netconfig ] && inst_simple /etc/netconfig
-    inst_simple /etc/services
-    for i in /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf; do
-        inst_simple $i
-    done
-    dracut_install rpc.idmapd
-    dracut_install sed
-
-    inst_libdir_file 'libnfsidmap_nsswitch.so*'
-    inst_libdir_file 'libnfsidmap/*.so'
-    inst_libdir_file 'libnfsidmap*.so*'
+    inst_libdir_file 'libnfsidmap_nsswitch.so*' 'libnfsidmap/*.so' 'libnfsidmap*.so*'
 
     _nsslibs=$(sed -e '/^#/d' -e 's/^.*://' -e 's/\[NOTFOUND=return\]//' /etc/nsswitch.conf \
         |  tr -s '[:space:]' '\n' | sort -u | tr -s '[:space:]' '|')