Comment 2 for bug 1369367

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: stevpier@vm-stevpier-20141208033149-h5g3ylznt0y1p9wv
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/cirros/
# testament_sha1: 4c3a9c8dfd4accb6b8f5d119c8320b569e6c7140
# timestamp: 2014-12-07 21:34:26 -0600
# base_revision_id: <email address hidden>
#
# Begin patch
=== modified file 'src/sbin/cirros-dhcpc'
--- src/sbin/cirros-dhcpc 2014-09-05 16:51:59 +0000
+++ src/sbin/cirros-dhcpc 2014-12-08 03:31:49 +0000
@@ -20,15 +20,25 @@
        # routes are pairs of network and gateway
        # 169.254.169.254/32 10.65.0.128
        local net="" router="" err=0
+ local_interface="$1"
+ shift 1
        while [ $# -ne 0 ]; do
                net="$1"
                router="$2"
- [ -n "$net" ] || continue
- debug 1 "adding net $net with router $router"
- route add -net "$net" gw "$router" || {
- error "WARN: failed: route add -net \"$net\" gw \"$router\""
- err=$(($err+1));
- }
+ if [ "$router" == "0.0.0.0" ] ; then
+ debug 1 "adding net $net to $interface"
+ route add -net "$net" dev "$interface" || {
+ error "WARN: failed: route add -net \"$net\" dev \"$interface\""
+ err=$(($err+1));
+ }
+ else
+ debug 1 "adding net $net with router $router"
+ route add -net "$net" gw "$router" || {
+ [ -n "$net" ] || continue
+ error "WARN: failed: route add -net \"$net\" gw \"$router\""
+ err=$(($err+1));
+ }
+ fi
                shift 2 || {
                        error "apply_static_routes: failed shift 2. odd number of args?"
                        return 1;
@@ -128,7 +138,7 @@
                done
        } > "$RESOLV_CONF"

- apply_static_routes $staticroutes
+ apply_static_routes $interface $staticroutes
 }

 case "$1" in

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdvIGj0AAe3fgEAwVGv//3IB
EI6////+UAR9cSe7eXme3t3Y0OCUQmk9U9MUepp6I2Qm1MaJkAAbSGgyiMjEyp7Qp7UZIDNJoaBo
AAAlBCBMTQ0p71SD1GaA0mBHqep6CMCRSU9pJ5RtR7UJhPSAaG1NAAGgAkkTCCmZMIU3k1JspoAA
AaBowRBIY0wbQ2Nn5OO7xcxlP4wywT++LgIT9/uy4yQac1WFWCHRky5HTwyvdFPLTvO3houKC9gj
HY4pYegT/V6oql07FNw0axdCwjBXIOv0dzwvs3Y2GMDMGf3c6HzR2keHsxXpko+JPK6VHCks8yJz
wILlNEQtrx5G+VJvvZpWTlqamug17GVFFFVkkwMBb+RxhRUFVFYbhlspaSDsZEZ+BwB4nZQ/SlOw
SGFl9CvrvonIEX6D6YR4tUbwPLogwxOdtKLNuuR6gi7HiLf5sySEdONwoikXR0fmMIvCfqTEwNqo
maxV/EPExyY223m3XDDJCNziKc5g6UZ2pkbyxpCeqMwmpLtAmy6OTBaqs+BXt6RLJTL5dZPGwbga
ivlALIITCyM32koM9tkEwwxKyTVlEQqWOy9TURhIWzUlGdZHqE6q4uTUCvSyBBdfzJOJxAo5m2Ox
YUU52vZ3zxrIJN8qWvgF4CLBfWDlvNi9MnozIZrstNCMSsOcBEC0I4KA4NSUht4eyQkHLIQQJ3Xv
hVQ/DRKkFrrkEpdWPNbTiyVAtJSv2E8isqqpYy5arlmstLFDIslgSBt5CNq2k/iL24dCwWctVlhH
0+7QS4keqopvqbcXEDk+5x8jhGNmraGnV2PNLUwK4ZUVV8VvRWIZ50KCaaICw4PPTZUuv42QIXuN
Am2VBcboMGqtfcNFoSAs8ILxahxp15BUB6FRDdRcvPBc20CbHObFWNAQhFk8J1VG70kk/IpIr2La
iXP0DzQsdaRHjiXAeWUVZZbtdAsGC7u/+yiwzNj0WQxdN9WPdIFfOcYmRGSublWhxT6y1q/XAz18
5QmpZWmLcxTTXwaUBQ8i4M+wGa6jMSSVZYEklqyhHDpiduI+lFJUHIpM1v/mcrWO6TMTWkqEAciN
+kXPwyBTiAqJhRO/eIunDrdMya0v/SjElG0zGXx2VnKlJZAqKbfYKZSxKF+YZsceMMVRoD5wRa3q
hR2jbAwJsczsCoMit4Qhe2DJ+3m/IzadOncLtDFLFWZVhu7JXhGJZCREOrKZ4KmINGRIYvM0op90
K+gmgibk5lgDg10U1u58X+7REwsdIJgYc6TMJAOhMQXifQDXmQg7aioU4EmoSbuLI4G1hkTZWjIG
GQnhxoRPlcRFrdtVKxofWGpNZg02jSK0aoGE3VXb0nHrki3RivZYDq1pAMDkqyN0KkvIbRn82C0a
Ya3uLmWTBqlQ4dyM96YHMGDUIYKElWb8nU1scdhTBTBwUMpMFQeuB4BkntPCUAZG2tC0GAYXlAKU
mktJZu1LUKftakusWlb1vsKS2sZ2RFTfPpNaD/F3JFOFCQ28gaPQ