Ensure Emulab virt control routing hack works both ways.

bin/setup-driver.sh

@@ -21,9 +21,12 @@ fi
 logtstart "driver"
 
 # Hack for Emulab
-grep -q 155.98 /var/emulab/boot/bossip \
-    && ip -br address show eth0 | grep '172\.' \
-    && route add -net 155.98.36.0/22 dev eth0
+grep -q 155.98 /var/emulab/boot/bossip
+if [ $? -eq 0 ]; then
+    controlif=`cat /var/emulab/boot/controlif`
+    ip route add 155.98.36.0/22 dev $controlif
+    ip route add 172.16.0.0/12 dev $controlif
+fi
 
 echo "*** Setting up root ssh pubkey access across all nodes..."