fix: check if xx-lib.sh is needed before executing

modules.d/90crypt/cryptroot-ask.sh

@@ -78,7 +78,7 @@ asked_file=/tmp/cryptroot-asked-$luksname
 # load dm_crypt if it is not already loaded
 [ -d /sys/module/dm_crypt ] || modprobe dm_crypt
 
-. /lib/dracut-crypt-lib.sh
+command -v ask_for_password > /dev/null || . /lib/dracut-crypt-lib.sh
 
 #
 # Open LUKS device

modules.d/90crypt/probe-keydev.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /lib/dracut-crypt-lib.sh
+command -v test_dev > /dev/null || . /lib/dracut-crypt-lib.sh
 
 real_keydev="$1"
 keypath="$2"

modules.d/90livenet/livenetroot.sh

@@ -2,8 +2,7 @@
 # livenetroot - fetch a live image from the network and run it
 
 type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
-
-. /lib/url-lib.sh
+type fetch_url > /dev/null 2>&1 || . /lib/url-lib.sh
 
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 RETRIES=${RETRIES:-100}

modules.d/90livenet/parse-livenet.sh

@@ -3,7 +3,8 @@
 # root=live:[url-to-backing-file]
 
 [ -z "$root" ] && root=$(getarg root=)
-. /lib/url-lib.sh
+get_url_handler
+command -v get_url_handler > /dev/null || . /lib/url-lib.sh
 
 # live updates
 updates=$(getarg live.updates=)

modules.d/95cifs/cifsroot.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
-. /lib/cifs-lib.sh
+type cifs_to_var > /dev/null 2>&1 || . /lib/cifs-lib.sh
 
 [ "$#" = 3 ] || exit 1
 

modules.d/95cifs/parse-cifsroot.sh

@@ -10,7 +10,7 @@
 #
 
 type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
-. /lib/cifs-lib.sh
+type cifs_to_var > /dev/null 2>&1 || . /lib/cifs-lib.sh
 
 # This script is sourced, so root should be set. But let's be paranoid
 [ -z "$root" ] && root=$(getarg root=)

modules.d/95nfs/nfsroot.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
-. /lib/nfs-lib.sh
+type nfs_to_var > /dev/null 2>&1 || . /lib/nfs-lib.sh
 
 [ "$#" = 3 ] || exit 1