Moves ssh and provision files into share folder

diff --git a/kvmx b/kvmx
index 44800f1ed4055753e6c048411eb1516edd86835f..a3fd9f820a5a0ddeb12c96d80e49251a58a69645 100755 (executable)
--- a/kvmx
+++ b/kvmx
@@ -73,7 +73,7 @@ function __kvmx_initialize {
   # Default parameters
   PORT="$(($RANDOM + 1024))"
   SSH="$(($PORT + 22))"
-  SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=FATAL -o ProxyCommand=none -i $APP_BASE/ssh/insecure_private_key"
+  SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=FATAL -o ProxyCommand=none -i $APP_BASE/share/ssh/insecure_private_key"
   SSH_LOGIN="user"
 
   # Initalize

diff --git a/kvmxfile b/kvmxfile
index 965baca962760b61bd591e7102da990fa9ef350e..7e5e950ccbc40be781bcf4c7b057cb3cd49b0781 100644 (file)
--- a/kvmxfile
+++ b/kvmxfile
@@ -10,7 +10,7 @@ shared_folder="."
 shared_folder_mountpoint="/home/user/code/$VM"
 
 # Folder to sync during provisioning in the format "/host/folder /guest/folder".
-#provision_rsync="$KVMX_BASE/provision/ /usr/local/share/kvmx/provision/"
+#provision_rsync="$KVMX_BASE/share/provision/ /usr/local/share/kvmx/provision/"
 
 # Absolute path for a provision script located inside the guest.
 #provision_command="/usr/local/share/kvmx/provision/desktop-basic"

diff --git a/provision/desktop-basic b/share/provision/desktop-basic
similarity index 100%
rename from provision/desktop-basic
rename to share/provision/desktop-basic

diff --git a/provision/desktop-full b/share/provision/desktop-full
similarity index 100%
rename from provision/desktop-full
rename to share/provision/desktop-full

diff --git a/provision/development b/share/provision/development
similarity index 100%
rename from provision/development
rename to share/provision/development

diff --git a/provision/files/desktop-basic/etc/default/keyboard b/share/provision/files/desktop-basic/etc/default/keyboard
similarity index 100%
rename from provision/files/desktop-basic/etc/default/keyboard
rename to share/provision/files/desktop-basic/etc/default/keyboard

diff --git a/provision/files/desktop-basic/etc/lightdm/lightdm.conf b/share/provision/files/desktop-basic/etc/lightdm/lightdm.conf
similarity index 100%
rename from provision/files/desktop-basic/etc/lightdm/lightdm.conf
rename to share/provision/files/desktop-basic/etc/lightdm/lightdm.conf

diff --git a/provision/files/desktop-basic/home/user/.custom/xsession b/share/provision/files/desktop-basic/home/user/.custom/xsession
similarity index 100%
rename from provision/files/desktop-basic/home/user/.custom/xsession
rename to share/provision/files/desktop-basic/home/user/.custom/xsession

diff --git a/provision/files/desktop-basic/mozilla/LICENSES/GPLv3.txt b/share/provision/files/desktop-basic/mozilla/LICENSES/GPLv3.txt
similarity index 100%
rename from provision/files/desktop-basic/mozilla/LICENSES/GPLv3.txt
rename to share/provision/files/desktop-basic/mozilla/LICENSES/GPLv3.txt

diff --git a/provision/files/desktop-basic/mozilla/LICENSES/gpl-2.0.txt b/share/provision/files/desktop-basic/mozilla/LICENSES/gpl-2.0.txt
similarity index 100%
rename from provision/files/desktop-basic/mozilla/LICENSES/gpl-2.0.txt
rename to share/provision/files/desktop-basic/mozilla/LICENSES/gpl-2.0.txt

diff --git a/provision/files/desktop-basic/mozilla/LICENSES/https-everywhere.txt b/share/provision/files/desktop-basic/mozilla/LICENSES/https-everywhere.txt
similarity index 100%
rename from provision/files/desktop-basic/mozilla/LICENSES/https-everywhere.txt
rename to share/provision/files/desktop-basic/mozilla/LICENSES/https-everywhere.txt

diff --git a/provision/files/desktop-basic/mozilla/LICENSES/vimperator.txt b/share/provision/files/desktop-basic/mozilla/LICENSES/vimperator.txt
similarity index 100%
rename from provision/files/desktop-basic/mozilla/LICENSES/vimperator.txt
rename to share/provision/files/desktop-basic/mozilla/LICENSES/vimperator.txt

diff --git a/provision/files/desktop-basic/mozilla/README.md b/share/provision/files/desktop-basic/mozilla/README.md
similarity index 100%
rename from provision/files/desktop-basic/mozilla/README.md
rename to share/provision/files/desktop-basic/mozilla/README.md

diff --git a/provision/files/desktop-basic/mozilla/mozilla.tar.bz2 b/share/provision/files/desktop-basic/mozilla/mozilla.tar.bz2
similarity index 100%
rename from provision/files/desktop-basic/mozilla/mozilla.tar.bz2
rename to share/provision/files/desktop-basic/mozilla/mozilla.tar.bz2

diff --git a/provision/webserver b/share/provision/webserver
similarity index 100%
rename from provision/webserver
rename to share/provision/webserver

diff --git a/ssh/insecure_private_key b/share/ssh/insecure_private_key
similarity index 100%
rename from ssh/insecure_private_key
rename to share/ssh/insecure_private_key

diff --git a/ssh/insecure_private_key.pub b/share/ssh/insecure_private_key.pub
similarity index 100%
rename from ssh/insecure_private_key.pub
rename to share/ssh/insecure_private_key.pub