diff options
| -rwxr-xr-x | kvmx | 15 | ||||
| -rwxr-xr-x | share/provision/desktop-basic | 2 |
2 files changed, 16 insertions, 1 deletions
@@ -219,6 +219,7 @@ function kvmx_up { shared_folder="`cd $KVMX_PROJECT_FOLDER && cd $shared_folder &> /dev/null && pwd`" # Requires samba package installed in the host; see http://unix.stackexchange.com/a/183609 #local shared="-net user,smb=$shared_folder" + # See http://wiki.qemu-project.org/Documentation/9psetup local shared="-fsdev local,id=shared,path=$shared_folder,security_model=none -device virtio-9p-pci,fsdev=shared,mount_tag=shared" fi @@ -744,6 +745,20 @@ function kvmx_rotate_sshkeys { mv $SSHKEY.new.pub $SSHKEY.pub } +# Xpra integration +function kvmx_xpra { + if ! which xpra &> /dev/null; then + echo "$BASENAME: please install xpra package" + exit 1 + fi + + local action="$3" + shift 3 + + SSH="`cat $SSHFILE`" + xpra $action --ssh="$SSH_COMMAND -p $SSH" ssh:$SSH_LOGIN@127.0.0.1 $* +} + # Dispatch if type kvmx_$ACTION 2> /dev/null | grep -q 'function'; then __kvmx_initialize diff --git a/share/provision/desktop-basic b/share/provision/desktop-basic index 3f3855b..ae103c9 100755 --- a/share/provision/desktop-basic +++ b/share/provision/desktop-basic @@ -46,7 +46,7 @@ apps/metadot deps-bundle desktop-basic # Additional packages echo "Installing additional packages..." -$APT_INSTALL lightdm firefox-esr chromium torbrowser-launcher +$APT_INSTALL xpra lightdm firefox-esr chromium torbrowser-launcher # System-wide configuration sudo cp $DIRNAME/files/desktop-basic/etc/lightdm/lightdm.conf /etc/lightdm/lightdm.conf |