diff options
author | torben | 2016-02-08 15:47:58 +0100 |
---|---|---|
committer | torben | 2016-02-08 15:47:58 +0100 |
commit | e8bf12db64c2ce8a35bd9cd113f83a4454da7710 (patch) | |
tree | b763bc19456b9903f84d9a120d9b6b1f283192e3 /builder/dnbd3-rootfs/module-setup.sh | |
parent | Improve logging. (diff) | |
download | systemd-init-e8bf12db64c2ce8a35bd9cd113f83a4454da7710.tar.gz systemd-init-e8bf12db64c2ce8a35bd9cd113f83a4454da7710.tar.xz systemd-init-e8bf12db64c2ce8a35bd9cd113f83a4454da7710.zip |
Improve module check dracut integration.
Diffstat (limited to 'builder/dnbd3-rootfs/module-setup.sh')
-rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 081b641b..bd6b8df3 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -53,11 +53,11 @@ check() { if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \ [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]] then - build_compile_dnbd3 "$moddir/binaries/dnbd3/" + build_compile_dnbd3 "$moddir/binaries/dnbd3/" || return 1 fi if [[ ! -f "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then build_compile_systemd_preserve_process_marker \ - "$moddir/binaries/systemd-preserve-process-marker/" + "$moddir/binaries/systemd-preserve-process-marker/" || return 1 fi # NOTE: This are workarounds for: @@ -70,16 +70,17 @@ check() { ln --symbolic --force "$alternate_systemd_udevd_location" \ "${initdir}${systemdutildir}/systemd-udevd" #cp "$alternate_systemd_udevd_location" \ - # "${initdir}${systemdutildir}/systemd-udevd" + # "${initdir}${systemdutildir}/systemd-udevd" 1>&2 fi - # - "/usr/bin/sh" isn't available. + # - "/usr/bin/sh" isn't available but "/bin/sh". if [[ ! -f /usr/bin/sh ]] && [[ -f /bin/sh ]]; then ln --symbolic --force /bin/sh /usr/bin/sh fi exceptions.deactivate - return 0 + # This modules is only needed if specified explicitly. + return 255 } depends() { |