Mount /proc inside chroot in ex/makevm to fix openjdk configuration

[gruntmaster-daemon.git] / ex / makevm

diff --git a/ex/makevm b/ex/makevm
index 81fbde81fa96a9a3cd57506ff7314137955eff17..c1d8c02303098291217a85692c3fb17a1eabd014 100755 (executable)
--- a/ex/makevm
+++ b/ex/makevm
@@ -1,9 +1,17 @@
 #!/bin/bash
 #!/bin/bash

+GROUP=$(getent group www-data | cut -f3 -d:)
+USER=$(getent passwd www-data | cut -f3 -d:)
+

 rm -rf vm/ vm.squashfs
 rm -rf vm/ vm.squashfs

+mkdir -p vm/proc/
+mount /proc -o bind vm/proc

 multistrap -f ex/vm.conf
 ln -s vm/usr/bin/mawk vm/bin/awk
 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
 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
 cat > vm/.profile <<EOF
 mount -a
 stty -F /dev/ttyS1 -echo


@@ -17,6 +25,8 @@ squashfs
 9pnet_virtio
 EOF
 install gruntmaster-exec gruntmaster-compile vm/usr/bin/
 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
 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
 mksquashfs vm vm.squashfs -comp lzo