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

2 files changed, 10 insertions, 20 deletions

diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index fab1d45e..01747a08 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -12,17 +12,23 @@ logging.set_level debug
 # endregion
 ( # subshell for variable scoping
 
-SLX_SERVER_BASE="$(getargs slxbase=)"
 source /etc/openslx
 
 # region find writable partition
 if ! persistent_device=$(tools.find_block_device \
-        "$SLX_WRITABLE_DEVICE_IDENTIFIER"); then
+    "$SLX_WRITABLE_DEVICE_IDENTIFIER")
+then
     logging.warn "Failed to find unique device with identifier" \
         "'${SLX_WRITABLE_DEVICE_IDENTIFIER}'; matched devices:" \
         "'${persistent_device}'"
 fi
 
+# persistent storage on a filesystem (e.g. usb stick)
+# writable_device="$(losetup --find)"
+#dd if=/dev/zero of=persistent_storage.img bs=1k count=1000
+#losetup "$writable_device" persistent_storage.img
+#persistent='P'
+
 # TODO move somewhere else
 #tmp_device="$(tools.find_block_device \
     #'$SLX_TMP_PARTITION_IDENTIFIER')"
@@ -40,7 +46,7 @@ if [ -n "$persistent_device" ]; then
 else
     ramdisk_size="$SLX_RAMDISK_SIZE"
     if [ "$ramdisk_size" = "" ]; then
-        ramdisk_size="$(cat /proc/meminfo | awk '/MemTotal/ {print $2}')"
+        ramdisk_size="$(awk '/MemTotal/ {print $2}' /proc/meminfo)"
     fi
     # NOTE: If the kernel modul "brd" is compiled into current kernel we can't
     # configure ram disk size dynamically. In this case it have to be
@@ -57,11 +63,6 @@ else
     persistent='N'
 fi
 
-# persistent storage on a filesystem (e.g. usb stick)
-# writable_device="$(losetup --find)"
-#dd if=/dev/zero of=persistent_storage.img bs=1k count=1000
-#losetup "$writable_device" persistent_storage.img
-#persistent='P'
 
 # endregion
 
@@ -93,7 +94,7 @@ read_only_device=""
 if utils.dependency_check qemu-img && ! qemu-img info \
     "$SLX_DNBD3_DEVICE" | grep 'file format: raw'
 then
-    read_only_device="$(container-unpack-xmount $SLX_DNBD3_DEVICE)"
+    read_only_device="$(container-unpack-xmount "$SLX_DNBD3_DEVICE")"
 else
     # Workaround to detect partitions on raw disks can be omitted when the
     # dnbd3 kernel module supports it (like the nbd kernel module with
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index db1446a7..6dc2e40e 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -192,21 +192,10 @@ install() {
         inst "$file_path" "/usr/lib/rebash/$(basename "$file_path")"
     done
 
-    # TODO currently not used
-    # This script is triggered by udev upon finding the right partitions for
-    # persistent sessions.
-    #inst "$moddir/scripts/prepare-persistent-disks" \
-        #/sbin/prepare-persistent-disks
-
     # endregion
 
     # region configuration files
 
-    # TODO currently not used
-    # Udev rules detecting 44, 45, 46 partitions and running
-    # "prepare-persistent-disks" to prepare persistent partitions.
-    #inst "$moddir/udev/70-openslx-disk.rules" /etc/udev/rules.d/70-openslx-disk.rules
-
     # Use terminal readline settings from the template system.
     inst /etc/inputrc /etc/inputrc
     # Set some aliases for the initramfs context.