diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh index 38afd1eca..f8608fdf7 100755 --- a/modules.d/90crypt/cryptroot-ask.sh +++ b/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 diff --git a/modules.d/90crypt/probe-keydev.sh b/modules.d/90crypt/probe-keydev.sh index bb86b8fa6..bceb56a3b 100755 --- a/modules.d/90crypt/probe-keydev.sh +++ b/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" diff --git a/modules.d/90livenet/livenetroot.sh b/modules.d/90livenet/livenetroot.sh index eccaaed72..d8ea4bc3a 100755 --- a/modules.d/90livenet/livenetroot.sh +++ b/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} diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh index a1d14a8fc..68eb7c76f 100755 --- a/modules.d/90livenet/parse-livenet.sh +++ b/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=) diff --git a/modules.d/95cifs/cifsroot.sh b/modules.d/95cifs/cifsroot.sh index 83539d40d..f54213f5b 100755 --- a/modules.d/95cifs/cifsroot.sh +++ b/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 diff --git a/modules.d/95cifs/parse-cifsroot.sh b/modules.d/95cifs/parse-cifsroot.sh index b88bef489..19ccf9069 100755 --- a/modules.d/95cifs/parse-cifsroot.sh +++ b/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=) diff --git a/modules.d/95nfs/nfsroot.sh b/modules.d/95nfs/nfsroot.sh index 794e0d83a..a47ec8fb1 100755 --- a/modules.d/95nfs/nfsroot.sh +++ b/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