diff options
author | torben | 2015-12-04 14:52:09 +0100 |
---|---|---|
committer | torben | 2015-12-04 14:52:09 +0100 |
commit | a3e8f1ed6f4dc09a461820c4a77b3bfa53a78750 (patch) | |
tree | b39fac58db06629c46aef3a9318123f3c67f9ba0 /builder/dnbd3-rootfs/module-setup.sh | |
parent | Remove unneeded kcl params. (diff) | |
download | systemd-init-a3e8f1ed6f4dc09a461820c4a77b3bfa53a78750.tar.gz systemd-init-a3e8f1ed6f4dc09a461820c4a77b3bfa53a78750.tar.xz systemd-init-a3e8f1ed6f4dc09a461820c4a77b3bfa53a78750.zip |
Fix submodules. Improve portability.
Diffstat (limited to 'builder/dnbd3-rootfs/module-setup.sh')
-rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 2d5528f8..64452cfe 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -45,14 +45,14 @@ check() { # NOTE: This are workarounds for: # - distributions where "systemd-udevd" doesn't lives in "/usr/lib" but in # "/lib". - if [[ ! -f "${systemdutildir}/systemd-udevd" ]] && [[ -f /lib/systemd/systemd-udevd ]]; then + local alternate_systemd_udevd_location='/lib/systemd/systemd-udevd' + if [[ ! -f "${systemdutildir}/systemd-udevd" ]] && \ + [[ -f "$alternate_systemd_udevd_location" ]]; then mkdir --parents "${initdir}${systemdutildir}" - # TODO - #echo "${initdir}${systemdutildir}/systemd-udevd" - #echo /usr/lib/systemd/systemd-udevd - #ln --symbolic --force /lib/systemd/systemd-udevd \ + ln --symbolic --force "$alternate_systemd_udevd_location" \ + "${initdir}${systemdutildir}/systemd-udevd" + #cp "$alternate_systemd_udevd_location" \ # "${initdir}${systemdutildir}/systemd-udevd" - cp /lib/systemd/systemd-udevd "${initdir}${systemdutildir}/systemd-udevd" fi # - "/usr/bin/sh" isn't available. if [[ ! -f /usr/bin/sh ]] && [[ -f /bin/sh ]]; then |