diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2007-11-27 10:37:15 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2007-11-27 10:37:15 -0800 |
| commit | fae7c4099efc2f247ed9eb4a52f3839bcedf987a (patch) | |
| tree | 07c0a7c5a20c5d86c0cfbdfa2801a261c2741194 /debian | |
| parent | 65b95aa0fd0210501bd828299f561925269b6321 (diff) | |
| download | vyatta-cfg-fae7c4099efc2f247ed9eb4a52f3839bcedf987a.tar.gz vyatta-cfg-fae7c4099efc2f247ed9eb4a52f3839bcedf987a.zip | |
Fix 2497: check for duplicate ip address.
Also while we're add it, allow user to set an ipv6 address or get address from dhcp.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/vyatta-cfg.postinst.in | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/control b/debian/control index feb160c..10e1156 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Depends: bash (>= 3.1), procps (>= 1:3.2.7-3), quagga, coreutils (>= 5.97-5.3), - vyatta-config-migrate + vyatta-config-migrate, + dhcp3-client Suggests: util-linux (>= 2.13-5), net-tools, ethtool, diff --git a/debian/vyatta-cfg.postinst.in b/debian/vyatta-cfg.postinst.in index 05daf3b..4690c18 100644 --- a/debian/vyatta-cfg.postinst.in +++ b/debian/vyatta-cfg.postinst.in @@ -6,3 +6,11 @@ sysconfdir=@sysconfdir@ update-rc.d vyatta-ofr defaults 90 >/dev/null # do we want to start vyatta-ofr here in postinst? +if [ "$sysconfdir" != "/etc" ]; then + # remove the config files and replace with blank ones + for conf in dhcp3/dhclient.conf + do + [ -f /etc/$conf ] && mv -f /etc/$conf /etc/$conf.vyatta-save + touch /etc/$conf + done +fi |