Use hardcoded table for MAC addresses. Use more RAM.

diff --git a/scripts-server b/scripts-server
index 70b03c4e9391a334c0e63c8c6a08a1f703bc6ee6..5c6ac8bf68c3fe13427091f6e36faea3487eb2d8 100644 (file)
--- a/scripts-server
+++ b/scripts-server
@@ -2,22 +2,33 @@
 #
 # usage, e.g.:
 #   xm create scripts-server machine_name=bees-knees mac5=10
+#   xm create scripts-server machine_name=cats-whiskers mac5=20
 # name is the name of the server (as used in the LV volumes)
 # mac5 is the fifth octet of the MAC address: ac:de:48:00:xx:01
-# set install=1 if you want to run a Fedora install
+# set install=fcX if you want to run a Fedora install
+
+macs = { 'bees-knees'   : 10,
+         'cats-whiskers': 20
+       }
+mac5 = macs[machine_name]
 
 if 'install' in locals():
-  # Get these files from a Fedora mirror, in
-  # fedora/linux/releases/9/Fedora/x86_64/os/images/xen/
-  kernel = "/root/fc9-install/vmlinuz"
-  ramdisk = "/root/fc9-install/initrd.img"
+  # Get these files from a Fedora mirror, from a path like
+  # 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
+elif 'type' in locals() and type == 'hvm':
+  kernel = "/usr/lib/xen/boot/hvmloader"
+  builder = "hvm"
+  vnc = 1
+  vncpassword = "foobar"
 else:
   # Fedora installs GRUB.
   bootloader = "/usr/bin/pygrub"
 
 vcpus = 2
-memory = 1536
-maxmem = 8192
+memory = 7680
+maxmem = 16384
 name = machine_name
 vg = "not-forward"
 disk = [i % (vg, name) for i in ['phy:/dev/%s/%s-root,hda,w',