From 0481d5fd53b8c372c42c467179e48db543f128e5 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 22 Dec 2009 13:51:37 -0800 Subject: Fix return of dhcp start client. --- scripts/vyatta-interfaces.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 &"; -- cgit v1.2.3 From 782717c6d4a906ab03b8595340275a4b86790717 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 22 Dec 2009 13:52:05 -0800 Subject: Mark banner script executable --- scripts/vyatta-banner.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/vyatta-banner.pl diff --git a/scripts/vyatta-banner.pl b/scripts/vyatta-banner.pl old mode 100644 new mode 100755 -- cgit v1.2.3 From acd30f393748cbb12edde943808eb1212478aaa6 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 22 Dec 2009 13:52:55 -0800 Subject: Ignore more debian build files --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 496dcf53..482617d0 100644 --- a/.gitignore +++ b/.gitignore @@ -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 -- cgit v1.2.3