Fix previous commit

[gruntmaster-daemon.git] / ex / makevm

diff --git a/ex/makevm b/ex/makevm
index 81fbde81fa96a9a3cd57506ff7314137955eff17..aadc8612f723cdb419c8e95dd9606b9c41914318 100755 (executable)
--- a/ex/makevm
+++ b/ex/makevm
@@ -1,22 +1,28 @@
 #!/bin/bash
 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
-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 0 0
+tmpfs  /tmp  tmpfs  defaults     0 0
+procfs /proc proc   defaults     0 0
+EOF
 cat > vm/.profile <<EOF
-mount -a
-stty -F /dev/ttyS1 -echo
+mount /mnt
+mount /tmp
+mount /proc
+[ -e /dev/ttyS1 ] && stty -F /dev/ttyS1 -echo
 cd /mnt
 export PS1="# "
 EOF
-cat > vm/etc/initramfs-tools/modules <<EOF
-squashfs
-9p
-9pnet
-9pnet_virtio
+cat >> vm/etc/sudoers <<EOF
+Defaults>nobody closefrom=5
+Defaults>nobody !env_check
+Defaults>nobody env_keep="ONLINE_JUDGE PATH HOME"
 EOF
 install gruntmaster-exec gruntmaster-compile vm/usr/bin/
-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