diff options
| author | jandob | 2015-12-04 15:00:41 +0100 |
|---|---|---|
| committer | jandob | 2015-12-04 15:00:41 +0100 |
| commit | feefc52a95202fc5af7fb987e6140eed6f8f39bf (patch) | |
| tree | 819c73ecf2a53432a9e45684d3cc0b9747107e67 /builder/dnbd3-rootfs | |
| parent | update rebash (diff) | |
| parent | Sync (diff) | |
| download | systemd-init-feefc52a95202fc5af7fb987e6140eed6f8f39bf.tar.gz systemd-init-feefc52a95202fc5af7fb987e6140eed6f8f39bf.tar.xz systemd-init-feefc52a95202fc5af7fb987e6140eed6f8f39bf.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init
Diffstat (limited to 'builder/dnbd3-rootfs')
| -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 |