diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-12-22 14:02:45 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-12-22 14:02:45 -0800 |
| commit | bd6d2b96a93dff5e91fdb4bc30f4e3b761de7065 (patch) | |
| tree | 4196d3c478564d154654c56772c2f1d7cf129324 | |
| parent | a3a17acedc9fc88289d4659ef1b235af6626acfd (diff) | |
| parent | acd30f393748cbb12edde943808eb1212478aaa6 (diff) | |
| download | vyatta-cfg-quagga-bd6d2b96a93dff5e91fdb4bc30f4e3b761de7065.tar.gz vyatta-cfg-quagga-bd6d2b96a93dff5e91fdb4bc30f4e3b761de7065.zip | |
Merge branch 'kenwood' of 192.168.100.1:git/vyatta-cfg-system into kenwood
| -rw-r--r-- | .gitignore | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/vyatta-banner.pl | 0 | ||||
| -rwxr-xr-x | scripts/vyatta-interfaces.pl | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -15,7 +15,8 @@ /debian/files /debian/vyatta-cfg-system /debian/vyatta-cfg-system.postinst -/debian/vyatta-cfg-system.debhelper.log +/debian/*.log +/debian/*.substvars /INSTALL /Makefile.in /Makefile diff --git a/scripts/vyatta-banner.pl b/scripts/vyatta-banner.pl index 9f7c5ddb..9f7c5ddb 100644..100755 --- a/scripts/vyatta-banner.pl +++ b/scripts/vyatta-banner.pl diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index caba8b6f..d5b0f7d1 100755 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -219,7 +219,7 @@ sub run_dhclient { = generate_dhclient_intf_files($intf); dhcp_update_config($intf_config_file, $intf); - return is_intf_disabled($intf); + return if is_intf_disabled($intf); my $cmd = "$dhcp_daemon -pf $intf_process_id_file -x $intf 2> /dev/null; rm -f $intf_process_id_file 2> /dev/null;"; $cmd .= "$dhcp_daemon -q -nw -cf $intf_config_file -pf $intf_process_id_file -lf $intf_leases_file $intf 2> /dev/null &"; |