X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=ex%2Fmakevm;h=7da2614a0615365b5411365938f585eea34f66fd;hp=433370f71357a9ca16b2337faa33439eda9d893a;hb=5cb2e97f86ed6781612ae7892a8721fa48d31098;hpb=ce89d37fb1bd2aeeb41ed648afa81489ca823e71

diff --git a/ex/makevm b/ex/makevm
index 433370f..7da2614 100755
--- a/ex/makevm
+++ b/ex/makevm
@@ -1,7 +1,9 @@
 #!/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
+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
@@ -17,7 +19,8 @@ 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
 mksquashfs vm vm.squashfs -comp lzo