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

2 files changed, 16 insertions, 12 deletions

diff --git a/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh b/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh
index 19865586..e81cf43d 100755
--- a/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh
+++ b/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh
@@ -19,7 +19,8 @@ local parameter
 for parameter in $(getargs BOOTIF=); do
     info "PXE given boot interface $parameter"
     local dracut_interface_name="bootnet:$(echo $parameter | \
-        sed --regexp-extended 's/.{2}-((.{2}-){5}.{2})/\1/' | sed s/-/:/g)"
+        sed --regexp-extended 's/.{2}[:\-]((.{2}[:\-]){5}.{2})/\1/' | \
+        sed s/-/:/g)"
     info "Dracut interface name is: $dracut_interface_name"
     echo -n " ifname=$dracut_interface_name" >> \
         "${writeable_proc_cmdline_path}cmdline"
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 9101851c..ead0c99c 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -16,13 +16,13 @@ clean() {
     # dracut itself.
 
     if [[ -f "$moddir/binaries/nbd/nbd.ko" ]]; then
-        utils_clean_nbd "$moddir/binaries/nbd/"
+        build_clean_nbd "$moddir/binaries/nbd/"
     fi
     if [[ -f "$moddir/binaries/dnbd3/build/dnbd3.ko" || ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]; then
-        utils_clean_dnbd3 "$moddir/binaries/dnbd3/"
+        build_clean_dnbd3 "$moddir/binaries/dnbd3/"
     fi
     if [[ -f "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then
-        utils_clean_systemd_preserve_process_marker \
+        build_clean_systemd_preserve_process_marker \
             "$moddir/binaries/systemd-preserve-process-marker/"
     fi
     return 0
@@ -33,13 +33,15 @@ check() {
     exceptions.activate
 
     if [[ ! -f "$moddir/binaries/nbd/nbd.ko" ]]; then
-        utils_compile_nbd "$moddir/binaries/nbd/"
+        build_compile_nbd "$moddir/binaries/nbd/"
     fi
-    if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" || ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]; then
-        utils_compile_dnbd3 "$moddir/binaries/dnbd3/"
+    if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \
+       [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]
+    then
+        build_compile_dnbd3 "$moddir/binaries/dnbd3/"
     fi
     if [[ ! -f "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then
-        utils_compile_systemd_preserve_process_marker \
+        build_compile_systemd_preserve_process_marker \
             "$moddir/binaries/systemd-preserve-process-marker/"
     fi
 
@@ -129,13 +131,14 @@ install() {
 
     # region scripts
 
-    inst "$moddir/scripts/utils.sh" "/usr/lib/utils.sh"
-    for file in "$moddir/scripts/rebash/"*; do
-        inst "$file" "/usr/lib/rebash/$(basename $file)"
+    local file_path
+    for file_path in "$moddir/scripts/rebash/"*; do
+        inst "$file_path" "/usr/lib/rebash/$(basename "$file_path")"
     done
     # This script is triggered by udev upon finding the right partitions for
     # persistent sessions.
-    inst "$moddir/scripts/prepare-persistent-disks" /sbin/prepare-persistent-disks
+    inst "$moddir/scripts/prepare-persistent-disks" \
+        /sbin/prepare-persistent-disks
 
     # endregion