Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init

3 files changed, 17 insertions, 4 deletions

diff --git a/builder/dnbd3-rootfs/binaries/dnbd3 b/builder/dnbd3-rootfs/binaries/dnbd3
-Subproject c3c050851dc866f2311d33a262ed81af8c57ce2
+Subproject 7e0668d1e4f78a0c7ff8689b197e2c104ce569e
diff --git a/builder/dnbd3-rootfs/binaries/nbd/Makefile b/builder/dnbd3-rootfs/binaries/nbd/Makefile
index 4dd501c3..2bd08b8e 100755
--- a/builder/dnbd3-rootfs/binaries/nbd/Makefile
+++ b/builder/dnbd3-rootfs/binaries/nbd/Makefile
@@ -3,13 +3,13 @@ obj-m += nbd.o
 all: build
 
 build: update
-	make --directory /lib/modules/$(shell uname -r)/build M=$(PWD) modules
+	make --directory /lib/modules/$(shell uname --kernel-release)/build M=$(PWD) modules
 
 install:
-	make --directory /lib/modules/$(shell uname -r)/build M=$(PWD) modules_install
+	make --directory /lib/modules/$(shell uname --kernel-release)/build M=$(PWD) modules_install
 
 clean:
-	make --directory /lib/modules/$(shell uname -r)/build M=$(PWD) clean
+	make --directory /lib/modules/$(shell uname --kernel-release)/build M=$(PWD) clean
 
 update:
-	curl --location --remote-name "https://raw.githubusercontent.com/torvalds/linux/v$(uname --kernel-release | cut --delimiter='.' --fields=1-2)/drivers/block/nbd.c"
+	curl --location --remote-name "https://raw.githubusercontent.com/torvalds/linux/v$(shell uname --kernel-release | cut --delimiter='.' --fields=1-2)/drivers/block/nbd.c"
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 9275863d..386266bb 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -15,6 +15,19 @@ check() {
         utils_compile_systemd_preserve_process_marker \
             "$moddir/binaries/systemd-preserve-process-marker/"
     fi
+
+    # 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
+        mkdir --parents "${initdir}${systemdutildir}"
+        ln --symbolic --force /lib/systemd/systemd-udevd \
+            "${initdir}${systemdutildir}/systemd-udevd"
+    fi
+    # - "/usr/bin/sh" isn't available.
+    if [[ ! -f /usr/bin/sh ]] && [[ -f /bin/sh ]]; then
+        ln --symbolic --force /bin/sh /usr/bin/sh
+    fi
     return 0
 }