diff options
| author | Christian Rößler | 2016-04-29 15:26:42 +0200 |
|---|---|---|
| committer | Christian Rößler | 2016-04-29 15:26:42 +0200 |
| commit | 396a156f8de495cb39c0e37b31997d19da4919f0 (patch) | |
| tree | 9106f5a3909011ac3f4252dc01cde6c0cbf15c06 | |
| parent | [run-virt] Linux-VMs fd1: Xreset, umounter (diff) | |
| download | tm-scripts-396a156f8de495cb39c0e37b31997d19da4919f0.tar.gz tm-scripts-396a156f8de495cb39c0e37b31997d19da4919f0.tar.xz tm-scripts-396a156f8de495cb39c0e37b31997d19da4919f0.zip | |
[run-virt] Linux-VMs fd1: 'smores, Xreset Ubuntu
| -rwxr-xr-x | remote/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_runtime | 10 |
1 files changed, 8 insertions, 2 deletions
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 a238e9a1..53dcfc20 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 @@ -43,7 +43,7 @@ write_xreset() { patch_xreset_shebang() { # Patching after first line, to be exact. logger "openslx vm_runtime: patching ${XRESET} after shebang line, if necessary." - grep -q "${UMOUNTSCRIPT}" "${XRESET}" || sed "1 a ${UMOUNTSCRIPT} \&" -i "${XSETUP}" + grep -q "${UMOUNTSCRIPT}" "${XRESET}" || sed "1 a ${UMOUNTSCRIPT} \&" -i "${XRESET}" } case "${DISTRIBUTION}" in @@ -62,7 +62,7 @@ case "${DISTRIBUTION}" in xsetup_patch_shebang fi logger "openslx vm_runtime: patching ${RESET}." - xsetup_patch_shebang + xreset_patch_shebang fi ;; ubuntu) logger "openslx vm_runtime: Ubuntu detected, version ${VERSION}." @@ -79,6 +79,12 @@ case "${DISTRIBUTION}" in else patch_xsetup_shebang fi + if [ ! -e "${XRESET}" ]; then + XRESETP=/etc/X11/Xreset + write_xreset + else + patch_xreset_shebang + fi ;; debian) logger "openslx vm_runtime: Debian detected." ;; |