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

3 files changed, 8 insertions, 37 deletions

diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 95d13e51..3e93253f 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -85,15 +85,13 @@ else
     writable_device="$(losetup --find)"
     losetup "$writable_device" "$ramdisk_location"
 fi
-
-
 # endregion
 # region connect dnbd3
 IFS_backup="$IFS"
 IFS=","
 return_code=1
 for host in ${SLX_DNBD3_SERVERS}; do
-    logging.info "Trying host \"host\"."
+    logging.info "Trying host \"$host\"."
     if systemd-preserve-process-marker dnbd3-client --host "$host" --image \
         "${SLX_DNBD3_IMAGE}" --device "$SLX_DNBD3_DEVICE" \
         --rid "$SLX_DNBD3_RID"
@@ -105,8 +103,9 @@ done
 IFS="$IFS_backup"
 
 if [[ $return_code != 0 ]]; then
-    logging.warn "Failed to connect '${SLX_DNBD3_IMAGE}' from" \
-        "one of '$SLX_DNBD3_SERVERS' to '$SLX_DNBD3_DEVICE'."
+    logging.warn "Failed to connect \"${SLX_DNBD3_IMAGE}\" (revision" \
+        "\"$SLX_DNBD3_RID\") from one of \"$SLX_DNBD3_SERVERS\" to" \
+        "\"$SLX_DNBD3_DEVICE\"."
     exit 1
 fi
 # endregion
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 3599d797..1ef81a11 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -194,8 +194,10 @@ install() {
     # endregion
     # region hooks
     inst_hook cmdline 00 "$moddir/hooks/enable-sysrq.sh"
-    inst_hook cmdline 10 \
-        "$moddir/hooks/prepare-kernel-command-line-parameter.sh"
+    # NOTE: Can be used to support old style ip append syntax and have an
+    # exclusive interface name.
+    #inst_hook cmdline 10 \
+    #    "$moddir/hooks/prepare-kernel-command-line-parameter.sh"
     inst_hook cmdline 90 "$moddir/hooks/set-dracut-environment-variables.sh"
     inst_hook pre-udev 00 "$moddir/hooks/load-custom-kernel-modules.sh"
     # Get the openslx config from the servers configured in the kernel command
diff --git a/builder/dnbd3-rootfs/services/dnbd3-generator.sh b/builder/dnbd3-rootfs/services/dnbd3-generator.sh
deleted file mode 100644
index bb9e7ad5..00000000
--- a/builder/dnbd3-rootfs/services/dnbd3-generator.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-GENERATOR_DIR="$2"
-[ -z "$GENERATOR_DIR" ] && exit 1
-[ -d "$GENERATOR_DIR" ] || mkdir "$GENERATOR_DIR"
-#GENERATOR_DIR="/run/systemd/generator/"
-{
-    echo "[Unit]"
-    echo "Description=root fs on dnbd3 (distributed network block device)"
-    echo "After=dracut-initqueue.service network.target"
-    echo "Before=dracut-mount.service"
-    echo "DefaultDependencies=no"
-    echo "IgnoreOnIsolate=true"
-    echo "#Conflicts=shutdown.target"
-    echo "#ConditionKernelCommandLine=!"
-    echo "#ConditionPathExists=/etc/multipath.conf"
-    echo ""
-    echo "[Service]"
-    echo "Type=oneshot"
-    echo "RemainAfterExit=true"
-    echo "KillMode=none"
-    echo "ExecStartPre=/sbin/fetch-config"
-    echo "ExecStart=/sbin/dnbd3root"
-    echo "#ExecReload=/sbin/multipathd reconfigure"
-    echo "#ExecStop=echo 'stopping dnbd3'"
-} > "$GENERATOR_DIR"/dnbd3root.service
-[ -d "$GENERATOR_DIR"/sysinit.target.wants ] || mkdir -p "$GENERATOR_DIR"/sysinit.target.wants
-ln -s ../dnbd3root.service "$GENERATOR_DIR"/sysinit.target.wants/dnbd3root.service
-[ -d "$GENERATOR_DIR"/remote-fs.target.wants ] || mkdir -p "$GENERATOR_DIR"/remote-fs.target.wants
-ln -s ../dnbd3root.service "$GENERATOR_DIR"/remote-fs.target.wants/dnbd3root.service
-exit 0