remove vnc option during make

Remove the unnecessary default vnc :1 argument during make.
It also does not allow make to proceed if another vm is already using :1

Reviewed-by: Nadav Har'El <nyh@cloudius-systems.com>
Signed-off-by: Jaspal Singh Dhillon <jaspal.iiith@gmail.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>

scripts/mkzfs.py

@@ -39,7 +39,7 @@ depends.write(u'%s: \\\n' % (options.output,))
 
 image_path = os.path.abspath(options.output)
 
-osv = subprocess.Popen('cd ../..; scripts/run.py -c1 -m 512 -i %s -u -s -e "--nomount tools/mkfs.so; tools/cpiod.so --prefix /zfs/zfs" --forward tcp:10000::10000' % image_path, shell = True, stdout=subprocess.PIPE)
+osv = subprocess.Popen('cd ../..; scripts/run.py --vnc none -c1 -m 512 -i %s -u -s -e "--nomount tools/mkfs.so; tools/cpiod.so --prefix /zfs/zfs" --forward tcp:10000::10000' % image_path, shell = True, stdout=subprocess.PIPE)
 
 upload_manifest.upload(osv, manifest, depends)
 

scripts/upload_manifest.py

@@ -160,7 +160,7 @@ def main():
     depends.write(u'%s: \\\n' % (options.output,))
 
     image_path = os.path.abspath(options.output)
-    osv = subprocess.Popen('cd ../..; scripts/run.py -m 512 -c1 -i %s -u -s -e "/tools/cpiod.so" --forward tcp:10000::10000' % image_path, shell = True, stdout=subprocess.PIPE)
+    osv = subprocess.Popen('cd ../..; scripts/run.py --vnc none -m 512 -c1 -i %s -u -s -e "/tools/cpiod.so" --forward tcp:10000::10000' % image_path, shell = True, stdout=subprocess.PIPE)
 
     upload(osv, manifest, depends)