Check for standard static-network-up event in addition to our custom event.

This will prevent the image from hanging inexplicably at boot when used
external to Emulab control in a situation like, I don't know, maybe your
machine is miles away at a datacenter and you would have to go stand
around in a noisy machine room for hours to figure out what is wrong...

clientside/tmcc/ubuntu10/rc-sysinit.conf

@@ -6,7 +6,10 @@
 description	"System V initialisation compatibility"
 author		"Scott James Remnant <scott@netsplit.com>"
 
-start on filesystem and net-device-up IFACE=lo and emulab-findcnet-done
+start on (filesystem and
+          (static-network-up or
+	   (net-device-up IFACE=lo and emulab-findcnet-done)) or
+	  failsafe-boot)
 stop on runlevel
 
 # Default runlevel, this may be overriden on the kernel command-line

clientside/tmcc/ubuntu11/rc-sysinit.conf

@@ -6,7 +6,10 @@
 description	"System V initialisation compatibility"
 author		"Scott James Remnant <scott@netsplit.com>"
 
-start on filesystem and net-device-up IFACE=lo and emulab-findcnet-done
+start on (filesystem and
+          (static-network-up or
+	   (net-device-up IFACE=lo and emulab-findcnet-done)) or
+	  failsafe-boot)
 stop on runlevel
 
 # Default runlevel, this may be overriden on the kernel command-line