aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-03-16 16:00:24 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-03-16 16:00:24 -0300
commitdc567951ec5ffef0e691be57dc9fe588e3b60872 (patch)
tree57212ff544173c9b966b6555cad99dad4c29e887
parentf091d763234d0cc14a29409f9d4474af722051c7 (diff)
downloadkvmx-dc567951ec5ffef0e691be57dc9fe588e3b60872.tar.gz
kvmx-dc567951ec5ffef0e691be57dc9fe588e3b60872.tar.bz2
Moves ssh and provision files into share folder
-rwxr-xr-xkvmx2
-rw-r--r--kvmxfile2
-rwxr-xr-xshare/provision/desktop-basic (renamed from provision/desktop-basic)0
-rwxr-xr-xshare/provision/desktop-full (renamed from provision/desktop-full)0
-rwxr-xr-xshare/provision/development (renamed from provision/development)0
-rw-r--r--share/provision/files/desktop-basic/etc/default/keyboard (renamed from provision/files/desktop-basic/etc/default/keyboard)0
-rw-r--r--share/provision/files/desktop-basic/etc/lightdm/lightdm.conf (renamed from provision/files/desktop-basic/etc/lightdm/lightdm.conf)0
-rw-r--r--share/provision/files/desktop-basic/home/user/.custom/xsession (renamed from provision/files/desktop-basic/home/user/.custom/xsession)0
-rw-r--r--share/provision/files/desktop-basic/mozilla/LICENSES/GPLv3.txt (renamed from provision/files/desktop-basic/mozilla/LICENSES/GPLv3.txt)0
-rw-r--r--share/provision/files/desktop-basic/mozilla/LICENSES/gpl-2.0.txt (renamed from provision/files/desktop-basic/mozilla/LICENSES/gpl-2.0.txt)0
-rw-r--r--share/provision/files/desktop-basic/mozilla/LICENSES/https-everywhere.txt (renamed from provision/files/desktop-basic/mozilla/LICENSES/https-everywhere.txt)0
-rw-r--r--share/provision/files/desktop-basic/mozilla/LICENSES/vimperator.txt (renamed from provision/files/desktop-basic/mozilla/LICENSES/vimperator.txt)0
-rw-r--r--share/provision/files/desktop-basic/mozilla/README.md (renamed from provision/files/desktop-basic/mozilla/README.md)0
-rw-r--r--share/provision/files/desktop-basic/mozilla/mozilla.tar.bz2 (renamed from provision/files/desktop-basic/mozilla/mozilla.tar.bz2)bin6420789 -> 6420789 bytes
-rwxr-xr-xshare/provision/webserver (renamed from provision/webserver)0
-rw-r--r--share/ssh/insecure_private_key (renamed from ssh/insecure_private_key)0
-rw-r--r--share/ssh/insecure_private_key.pub (renamed from ssh/insecure_private_key.pub)0
17 files changed, 2 insertions, 2 deletions
diff --git a/kvmx b/kvmx
index 44800f1..a3fd9f8 100755
--- 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 965baca..7e5e950 100644
--- 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
index 38d69e3..38d69e3 100755
--- a/provision/desktop-basic
+++ b/share/provision/desktop-basic
diff --git a/provision/desktop-full b/share/provision/desktop-full
index 6f0f5ab..6f0f5ab 100755
--- a/provision/desktop-full
+++ b/share/provision/desktop-full
diff --git a/provision/development b/share/provision/development
index bca3847..bca3847 100755
--- a/provision/development
+++ b/share/provision/development
diff --git a/provision/files/desktop-basic/etc/default/keyboard b/share/provision/files/desktop-basic/etc/default/keyboard
index f18fc73..f18fc73 100644
--- a/provision/files/desktop-basic/etc/default/keyboard
+++ b/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
index f9b1371..f9b1371 100644
--- a/provision/files/desktop-basic/etc/lightdm/lightdm.conf
+++ b/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
index 97ef73d..97ef73d 100644
--- a/provision/files/desktop-basic/home/user/.custom/xsession
+++ b/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
index 94a9ed0..94a9ed0 100644
--- a/provision/files/desktop-basic/mozilla/LICENSES/GPLv3.txt
+++ b/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
index d159169..d159169 100644
--- a/provision/files/desktop-basic/mozilla/LICENSES/gpl-2.0.txt
+++ b/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
index 6ae040c..6ae040c 100644
--- a/provision/files/desktop-basic/mozilla/LICENSES/https-everywhere.txt
+++ b/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
index 2db7706..2db7706 100644
--- a/provision/files/desktop-basic/mozilla/LICENSES/vimperator.txt
+++ b/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
index 20b9a93..20b9a93 100644
--- a/provision/files/desktop-basic/mozilla/README.md
+++ b/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
index a921aee..a921aee 100644
--- a/provision/files/desktop-basic/mozilla/mozilla.tar.bz2
+++ b/share/provision/files/desktop-basic/mozilla/mozilla.tar.bz2
Binary files differ
diff --git a/provision/webserver b/share/provision/webserver
index 650452f..650452f 100755
--- a/provision/webserver
+++ b/share/provision/webserver
diff --git a/ssh/insecure_private_key b/share/ssh/insecure_private_key
index 50b69ca..50b69ca 100644
--- a/ssh/insecure_private_key
+++ b/share/ssh/insecure_private_key
diff --git a/ssh/insecure_private_key.pub b/share/ssh/insecure_private_key.pub
index a82f4e9..a82f4e9 100644
--- a/ssh/insecure_private_key.pub
+++ b/share/ssh/insecure_private_key.pub