From 62a0002b7fa49a8fdb456f1397c3dcec7c7ccefd Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 14 Mar 2013 04:30:22 +0100 Subject: [PATCH] The Underscores Revolution: dispvm script path --- vm-init.d/qubes-core-appvm | 6 +++--- vm-systemd/prepare-dvm.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vm-init.d/qubes-core-appvm b/vm-init.d/qubes-core-appvm index 446dbe2..c14530a 100755 --- a/vm-init.d/qubes-core-appvm +++ b/vm-init.d/qubes-core-appvm @@ -10,11 +10,11 @@ possibly_run_save_script() { ENCODED_SCRIPT=$(xenstore-read qubes-save-script) if [ -z "$ENCODED_SCRIPT" ] ; then return ; fi - echo $ENCODED_SCRIPT|perl -e 'use MIME::Base64 qw(decode_base64); local($/) = undef;print decode_base64()' >/tmp/qubes_save_script - chmod 755 /tmp/qubes_save_script + echo $ENCODED_SCRIPT|perl -e 'use MIME::Base64 qw(decode_base64); local($/) = undef;print decode_base64()' >/tmp/qubes-save-script + chmod 755 /tmp/qubes-save-script Xorg -config /etc/X11/xorg-preload-apps.conf :0 & while ! [ -S /tmp/.X11-unix/X0 ]; do sleep 0.5; done - DISPLAY=:0 su - user -c /tmp/qubes_save_script + DISPLAY=:0 su - user -c /tmp/qubes-save-script killall Xorg } diff --git a/vm-systemd/prepare-dvm.sh b/vm-systemd/prepare-dvm.sh index 05c1324..7eb6ba3 100755 --- a/vm-systemd/prepare-dvm.sh +++ b/vm-systemd/prepare-dvm.sh @@ -4,11 +4,11 @@ possibly_run_save_script() { ENCODED_SCRIPT=$(xenstore-read qubes-save-script) if [ -z "$ENCODED_SCRIPT" ] ; then return ; fi - echo $ENCODED_SCRIPT|perl -e 'use MIME::Base64 qw(decode_base64); local($/) = undef;print decode_base64()' >/tmp/qubes_save_script - chmod 755 /tmp/qubes_save_script + echo $ENCODED_SCRIPT|perl -e 'use MIME::Base64 qw(decode_base64); local($/) = undef;print decode_base64()' >/tmp/qubes-save-script + chmod 755 /tmp/qubes-save-script Xorg -config /etc/X11/xorg-preload-apps.conf :0 & while ! [ -S /tmp/.X11-unix/X0 ]; do sleep 0.5; done - DISPLAY=:0 su - user -c /tmp/qubes_save_script + DISPLAY=:0 su - user -c /tmp/qubes-save-script killall Xorg }