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

3 files changed, 10 insertions, 7 deletions

diff --git a/builder/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
index a842d9e3..cc34747b 100755
--- a/builder/dnbd3-rootfs/hooks/mount-root-device.sh
+++ b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
@@ -1,7 +1,10 @@
 ( # subshell for variable scoping
-source "/etc/openslx"
-mount /dev/mapper/root "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS
-genfstab "$NEWROOT" > "$NEWROOT/etc/fstab"
+type getarg >/dev/null 2>&1 || source /lib/dracut-lib.sh
+if ! getarg root=; then
+    source "/etc/openslx"
+    mount /dev/mapper/root "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS
+    genfstab "$NEWROOT" > "$NEWROOT/etc/fstab"
+fi
 ) || exit $?
 # region vim modline
 
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 3b96239b..28f418ed 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -43,7 +43,7 @@ if ! qemu-img info --output json "$read_only_device" | grep '"format": "raw"'
 then
     read_only_device='/dev/nbd0'
     systemd-preserve-process-marker qemu-nbd --connect="$read_only_device" \
-        "$SLX_DNBD3_DEVICE" --read-only --persistent
+        "$SLX_DNBD3_DEVICE" --read-only --persistent --nocache
 
     # XXX better way to wait for the device to be made?
     i=0
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 7ef1a911..b4355012 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -192,13 +192,13 @@ install() {
     inst_multiple lsblk ping ip ifconfig sshd htop tail head vim touch sed \
         lsmod sleep route wget find lsof strace chroot switch_root pivot_root \
         mount fdisk mkfs.xfs env busybox ps agetty tree \
-        insmod blockdev partx dmsetup sed cut awk tr insmod \ #qemu-nbd \
+        insmod blockdev partx dmsetup sed cut awk tr insmod \
         blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
-        basename dirname sort mktemp diff qemu-img genfstab
+        basename dirname sort mktemp diff qemu-img genfstab mountpoint
     # Production:
     # inst_multiple insmod blockdev partx dmsetup sed cat cut awk tr touch \
     #     losetup grep basename dirname mktemp diff sleep wget mount sort \
-    #     qemu-nbd bash genfstab
+    #     qemu-nbd bash genfstab mountpoint
 }
 
 # region vim modline