summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neves2013-05-09 18:28:24 +0200
committerMichael Neves2013-05-09 18:28:24 +0200
commit39663ab183d0d466a8b4b22c3c647eccfec5f04f (patch)
tree247256340a8753509a5812bf9a8878e6cffbb299
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-39663ab183d0d466a8b4b22c3c647eccfec5f04f.tar.gz
tm-scripts-39663ab183d0d466a8b4b22c3c647eccfec5f04f.tar.xz
tm-scripts-39663ab183d0d466a8b4b22c3c647eccfec5f04f.zip
mount vm-store virt directory
-rw-r--r--remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.mount10
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport2
2 files changed, 11 insertions, 1 deletions
diff --git a/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.mount b/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.mount
new file mode 100644
index 00000000..704606a6
--- /dev/null
+++ b/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.mount
@@ -0,0 +1,10 @@
+[Unit]
+ Description=Mount vm-store NFS
+
+ [Mount]
+ What=vm-store.public.ads.uni-freiburg.de:vmwareImages/vmware/vmware65
+ Where=/var/lib/virt
+ Type=nfs
+ Options=rw,async,nolock,vers=3
+ StandardOutput=syslog
+ StandardError=syslog
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport
index cc08728e..64d5f485 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport
@@ -2,7 +2,7 @@
export PATH=$PATH:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin
-if grep "Ubuntu" "/etc/issue" >/dev/null; then
+if grep "Ubuntu 13.04" "/etc/issue" >/dev/null; then
EXPORT="132.230.8.113:/srv/ubuntu1304"
elif grep "SUSE" "/etc/issue" >/dev/null; then
EXPORT="132.230.8.113:/srv/suse"