Use strings for mac addresses, inactive eth1 kickstart.

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

diff --git a/scripts-server b/scripts-server
index d3a827ab78d3cbda838240f13f21f7e92c0c7325..6c7a9be0f56443186690c56211c7d1dac2e20be7 100644 (file)
--- a/scripts-server
+++ b/scripts-server
@@ -7,21 +7,24 @@
 # mac5 is the fifth octet of the MAC address: ac:de:48:00:xx:01
 # set install=fcX if you want to run a Fedora install, where X
 # is the version of Fedora to install
+#
+# Notice to potential Python hackers: this is /not/ a module!  So things like
+# imports will not work globally.
 
 vm_host = 0
 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'   : ['johnny-carson',    2, 4096, 90],
-             'better-mousetrap' : ['johnny-carson',  2, 4096,100],
+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'   : ['johnny-carson',    2, 4096, '90'],
+             'better-mousetrap' : ['johnny-carson',  2, 4096, 'a0'],
            }
 vm = machines[machine_name]
 

diff --git a/scripts.ks b/scripts.ks
index de5dd734faa874ba90f58ef1325b960666629baa..061ad4d46f1590234b7d73c2d5bf163fb52693d4 100644 (file)
--- a/scripts.ks
+++ b/scripts.ks
@@ -7,12 +7,14 @@
 #   arch            = ${arch}
 #   hostname        = ${hostname}
 #   ip              = ${ip}
+#   backend_ip      = ${backend_ip}
 
 install
 url --url=${local_mirror}/fedora/linux/releases/${fedora_release}/Fedora/${arch}/os
 lang en_US.UTF-8
 keyboard us
 network --device eth0 --bootproto static --ip ${ip} --netmask 255.255.0.0 --gateway 18.181.0.1 --nameserver 18.71.0.151 --hostname ${hostname}
+#network --device eth1 --bootproto static --ip ${backend_ip} --netmask 255.255.0.0
 
 timezone --utc America/New_York
 selinux --disabled