From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 23 Jan 2015 19:15:26 +0000 (+0200)
Subject: Change gruntmaster-exec setuid user/group in ex/makevm
X-Git-Tag: 5999.000_005~84
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=5cb2e97f86ed6781612ae7892a8721fa48d31098;p=gruntmaster-daemon.git

Change gruntmaster-exec setuid user/group in ex/makevm
---

diff --git a/ex/makevm b/ex/makevm
index 81fbde8..7da2614 100755
--- a/ex/makevm
+++ b/ex/makevm
@@ -1,4 +1,7 @@
 #!/bin/bash
+GROUP=$(getent group www-data | cut -f3 -d:)
+USER=$(getent passwd www-data | cut -f3 -d:)
+
 rm -rf vm/ vm.squashfs
 multistrap -f ex/vm.conf
 ln -s vm/usr/bin/mawk vm/bin/awk
@@ -17,6 +20,7 @@ squashfs
 9pnet_virtio
 EOF
 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