Browse Source

Temporary workaround for #322723: use 'route add' instead of 'ip route add'

r30067
tags/1.13
Frans Pop 16 years ago
parent
commit
fb657e95d6
3 changed files with 18 additions and 4 deletions
  1. +6
    -1
      debian/changelog
  2. +3
    -1
      dhclient-script
  3. +9
    -2
      static.c

+ 6
- 1
debian/changelog View File

@@ -13,6 +13,7 @@ netcfg (1.13) UNRELEASED; urgency=low
resolving the system hostname SHOULD NOT DO THIS, but those that
do so will not be disappointed: most services that listen locally
listen on all 127/8 addresses, not just on 127.0.0.1.

[ Joshua Kwan ]
* Add a netcfg/dhcp_timeout template that can be preseeded in case
a network or a set of machines are known to take a long time to
@@ -27,7 +28,11 @@ netcfg (1.13) UNRELEASED; urgency=low
* Add description for internal-usb template as used for usb net.
* Fix fallthrough on missing template.

-- Joey Hess <joeyh@debian.org> Tue, 16 Aug 2005 17:19:44 -0400
[ Frans Pop ]
* Temporary workaround for #322723: use 'route add' instead of
'ip route add' for both dynamic and static network configuration

-- Frans Pop <fjp@debian.org> Fri, 19 Aug 2005 19:35:49 +0200

netcfg (1.12) unstable; urgency=low



+ 3
- 1
dhclient-script View File

@@ -80,7 +80,9 @@ case "$reason" in
ip addr add $new_ip_address$new_mask $new_broadcast_arg dev $interface

for router in $new_routers; do
ip route add default via $router
# Use 'route' instead of 'ip': temporary workaround for #322723
# ip route add default via $router
route add default gw $router
done
fi



+ 9
- 2
static.c View File

@@ -328,11 +328,18 @@ int netcfg_activate_static(struct debconfclient *client)
if (pointopoint.s_addr)
{
snprintf(buf, sizeof(buf), "ip route add default dev %s", interface);
/* Use 'route' instead of 'ip route': temporary workaround for #322723
* snprintf(buf, sizeof(buf), "ip route add default dev %s", interface);
*/
snprintf(buf, sizeof(buf), "route add default dev %s", interface);
rv |= di_exec_shell_log(buf);
}
else if (gateway.s_addr) {
snprintf(buf, sizeof(buf), "ip route add default via %s",
/* Use 'route' instead of 'ip route': temporary workaround for #322723
* snprintf(buf, sizeof(buf), "ip route add default via %s",
* inet_ntop (AF_INET, &gateway, ptr1, sizeof (ptr1)));
*/
snprintf(buf, sizeof(buf), "route add default gw %s",
inet_ntop (AF_INET, &gateway, ptr1, sizeof (ptr1)));
rv |= di_exec_shell_log(buf);
}


Loading…
Cancel
Save