More accurate drive naming and some comments.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/scripts-server b/scripts-server
index cf78b723003299cebfc53ba07b2e78fd9ee12af3..a0d878b581901eeee3881bc75cbb0aa21d02d9a7 100644 (file)
--- a/scripts-server
+++ b/scripts-server
@@ -29,6 +29,10 @@ mac5 = vm[vm_mac5]
 if 'install' in locals():
   # Get these files from a Fedora mirror, from a path like
   # pub/fedora/linux/releases/test/11-Preview/Fedora/x86_64/os/isolinux/
+  # You can use ftp://mirrors.mit.edu and wget -R to easily grab the
+  # entire contents of the directory.  To do the network install, use
+  # a URL like ftp://mirrors.mit.edu/fedora/linux/releases/13/Fedora/x86_64/os
+  # I'm not sure what you're supposed to do for IPv6
   kernel = "/root/%s-install/vmlinuz" % install
   ramdisk = "/root/%s-install/initrd.img" % install
   extra = "selinux=0"
@@ -46,8 +50,8 @@ if 'memory' not in locals(): memory = vm[vm_mem]
 maxmem = 16384
 name = machine_name
 vg = vm[vm_host]
-disk = [i % (vg, name) for i in ['phy:/dev/%s/%s-root,hda,w',
-                                 'phy:/dev/%s/%s-swap,hdb,w']]
+disk = [i % (vg, name) for i in ['phy:/dev/%s/%s-root,xvda,w',
+                                 'phy:/dev/%s/%s-swap,xvde,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']]
 
@@ -55,3 +59,6 @@ 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')
+
+#if 'install' in locals():
+#  disk.append('file:/root/%s-install/cdimg.ext3.img,hdc1,r' % install)