X-Git-Url: https://scripts.mit.edu/gitweb/xen.git/blobdiff_plain/0a761b65bfdedd157d861d398f5df92435867c54..3fb90b5bd5b029304fe75224fe436a96616497de:/scripts-server

diff --git a/scripts-server b/scripts-server
index d665280..cf78b72 100644
--- a/scripts-server
+++ b/scripts-server
@@ -9,13 +9,18 @@
 # is the version of Fedora to install
 
 vm_host = 0
-vm_mem  = 1
-vm_mac5 = 2
-machines = { 'bees-knees'   : ['not-forward',  4096, 10],
-             'cats-whiskers': ['not-forward',  7168, 20],
-             'not-backward' : ['not-forward',  2048, 30],
-             'busy-beaver'  : ['conan-obrien', 3072, 40],
-             'pancake-bunny': ['conan-obrien', 3072, 50],
+vm_cpus = 1
+vm_mem  = 2
+vm_mac5 = 3
+machines = { 'bees-knees'     : ['david-letterman',  2, 6144, 10],
+             'cats-whiskers'  : ['david-letterman',  2, 6144, 20],
+             'not-backward'   : ['david-letterman',  2, 2560, 30],
+             'busy-beaver'    : ['conan-obrien',     2, 4096, 40],
+             'pancake-bunny'  : ['conan-obrien',     2, 4096, 50],
+             'whole-enchilada': ['jay-leno',         1, 2048, 60],
+             'real-mccoy'     : ['jay-leno',         2, 4096, 70],
+             'not-forward'    : ['jay-leno',         2,  512, 80],
+             'old-faithful'   : ['jay-leno',         2, 1024, 90],
            }
 vm = machines[machine_name]
 
@@ -26,6 +31,7 @@ if 'install' in locals():
   # pub/fedora/linux/releases/test/11-Preview/Fedora/x86_64/os/isolinux/
   kernel = "/root/%s-install/vmlinuz" % install
   ramdisk = "/root/%s-install/initrd.img" % install
+  extra = "selinux=0"
 elif 'type' in locals() and type == 'hvm':
   kernel = "/usr/lib/xen/boot/hvmloader"
   builder = "hvm"
@@ -35,7 +41,7 @@ else:
   # Fedora installs GRUB.
   bootloader = "/usr/bin/pygrub"
 
-vcpus = 2
+vcpus = vm[vm_cpus]
 if 'memory' not in locals(): memory = vm[vm_mem]
 maxmem = 16384
 name = machine_name
@@ -45,7 +51,7 @@ disk = [i % (vg, name) for i in ['phy:/dev/%s/%s-root,hda,w',
 vif = [i % mac5 for i in ['bridge=eth0, mac=ac:de:48:00:%s:01',
                           'bridge=eth1, mac=ac:de:48:00:%s:02']]
 
-if builder != "hvm":
+if 'builder' not in locals() or builder != "hvm":
   # https://bugzilla.redhat.com/show_bug.cgi?id=466681
   # pygrub uses cached and eventually outdated grub.conf, kernel and initrd
   file('/proc/sys/vm/drop_caches', 'w').write('1')