summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rwxr-xr-x[-rw-r--r--]scripts/vyatta-banner.pl0
-rwxr-xr-xscripts/vyatta-interfaces.pl2
3 files changed, 3 insertions, 2 deletions
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
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 &";