X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=ex%2Fmakevm;h=c1d8c02303098291217a85692c3fb17a1eabd014;hp=433370f71357a9ca16b2337faa33439eda9d893a;hb=2a6db3646ea8540fb41bea20c09a4167b7281ad4;hpb=ce89d37fb1bd2aeeb41ed648afa81489ca823e71;ds=sidebyside

diff --git a/ex/makevm b/ex/makevm
index 433370f..c1d8c02 100755
--- a/ex/makevm
+++ b/ex/makevm
@@ -1,10 +1,17 @@
 #!/bin/bash
-[ `id -u` -eq 0 ] || echo 'This script must be run as root' && exit 1
+GROUP=$(getent group www-data | cut -f3 -d:)
+USER=$(getent passwd www-data | cut -f3 -d:)
+
 rm -rf vm/ vm.squashfs
-multistrap -f vm.conf
+mkdir -p vm/proc/
+mount /proc -o bind vm/proc
+multistrap -f ex/vm.conf
 ln -s vm/usr/bin/mawk vm/bin/awk
-echo 'virtfs /mnt 9p trans=virtio,auto 0 0' > vm/etc/fstab
 echo '/sbin/poweroff -f' > vm/.bash_logout
+cat > vm/etc/fstab <<EOF
+virtfs /mnt 9p    trans=virtio,auto 0 0
+tmpfs  /tmp tmpfs defaults          0 0
+EOF
 cat > vm/.profile <<EOF
 mount -a
 stty -F /dev/ttyS1 -echo
@@ -17,7 +24,9 @@ squashfs
 9pnet
 9pnet_virtio
 EOF
-cp gruntmaster-exec gruntmaster-compile vm/usr/bin/
+install gruntmaster-exec gruntmaster-compile vm/usr/bin/
+sed -i -e "s/setgid 65534/setgid $GROUP/" -e "s/setuid 65534/setuid $USER/" vm/usr/bin/gruntmaster-exec
 chroot vm update-initramfs -d -k 3.2.0-4-amd64
 chroot vm update-initramfs -c -k 3.2.0-4-amd64
+umount vm/proc
 mksquashfs vm vm.squashfs -comp lzo