summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorChristian Rößler2016-05-03 15:04:02 +0200
committerChristian Rößler2016-05-03 15:04:02 +0200
commit367add5201d1612175c94203ab865b6006c10bd1 (patch)
tree38788dd374d619d268e9481834b09825927dbac5 /remote/modules
parent[run-virt] Linux-VMs fd1: 'smores, Xreset Ubuntu (diff)
downloadtm-scripts-367add5201d1612175c94203ab865b6006c10bd1.tar.gz
tm-scripts-367add5201d1612175c94203ab865b6006c10bd1.tar.xz
tm-scripts-367add5201d1612175c94203ab865b6006c10bd1.zip
[run-virt] Linux-MVs fd1: systemd service file fix, other little fix
Diffstat (limited to 'remote/modules')
-rwxr-xr-xremote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer4
-rwxr-xr-xremote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_runtime2
2 files changed, 3 insertions, 3 deletions
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer
index de3a8bb0..978cee20 100755
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer
@@ -25,9 +25,9 @@ case $(${PS} --pid 1 -o comm h) in
[Service]
Type=oneshot
+ ExecStartPre=${MKDIR} -p /mnt/diskmount
+ ExecStartPre=-${MOUNT} /dev/fd1 /mnt/diskmount
ExecStart=${LOGGER} "openslx service file: started."
- ExecStart=${MKDIR} -p /mnt/diskmount
- ExecStart=${MOUNT} | ${GREP} -q /mnt/diskmount || ${MOUNT} /dev/fd1 /mnt/diskmount
ExecStart=${MOUNTDIR}/linux/vm_runtime
ExecStart=${LOGGER} "openslx service file: done."
RemainAfterExit=no
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_runtime b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_runtime
index 53dcfc20..0a81c38d 100755
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_runtime
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_runtime
@@ -62,7 +62,7 @@ case "${DISTRIBUTION}" in
xsetup_patch_shebang
fi
logger "openslx vm_runtime: patching ${RESET}."
- xreset_patch_shebang
+ patch_xreset_shebang
fi
;;
ubuntu) logger "openslx vm_runtime: Ubuntu detected, version ${VERSION}."