Keep eth1 network device, and explicitly pick eth0 for install.

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

diff --git a/scripts-server b/scripts-server
index 8885c501f1843874d9f60a9be3c7755403569cee..b6f8bfbae44b770b756a28caad2a426509f546a3 100644 (file)
--- a/scripts-server
+++ b/scripts-server
@@ -83,8 +83,9 @@ def serve_kickstart(machine_name, install):
   except Exception, e:
     print "Serving kickstart failed."
     print e
+  else:
+    print "Kickstart served"
 
-  print "Kickstart served"
   sys.exit()
 
 if 'install' in locals():
@@ -105,6 +106,7 @@ if 'install' in locals():
       "netmask=255.255.0.0",
       "gateway=18.181.0.1",
       "dns=18.70.0.160,18.71.0.151,18.72.0.3",
+      "ksdevice=eth0",
       # "syslog=18.181.0.51:514 debug=1 loglevel=debug telnet",
       ])
   on_reboot = 'destroy' # don't rerun the installer
@@ -128,9 +130,6 @@ disk = [i % (vg, name) for i in ['phy:/dev/%s/%s-root,xvda,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 'install' in locals():
-   del vif[1]
-
 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

diff --git a/scripts.ks b/scripts.ks
index 49ac916403b14ae671c04436200ca66980fa75c2..d37ea61cc369e44565866dd5abe749ba5e6cc6e3 100644 (file)
--- a/scripts.ks
+++ b/scripts.ks
@@ -14,7 +14,7 @@ url --url=${local_mirror}/fedora/linux/releases/${fedora_release}/Fedora/${arch}
 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.70.0.160,18.71.0.151,18.72.0.3 --hostname ${hostname}
-#network --device eth1 --bootproto static --ip ${backend_ip} --netmask 255.255.0.0
+network --device eth1 --bootproto static --ip ${backend_ip} --netmask 255.255.0.0
 
 timezone --utc America/New_York
 selinux --disabled