From 10ca4cd0c4ab9cb268d301f75e7f73fca340651a Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Thu, 10 Jul 2008 16:55:32 -0700 Subject: fix for bug 3451: add messages output --- functions/tech-support | 3 +++ 1 file changed, 3 insertions(+) diff --git a/functions/tech-support b/functions/tech-support index 18647f1..73b5eb6 100755 --- a/functions/tech-support +++ b/functions/tech-support @@ -225,6 +225,9 @@ done header wanrouter conflog wanrouter conflog +header /var/log/messages +tail -n 250 /var/log/messages + header "END OF TECH-SUPPORT FILE" ) 1>&$OUT 2>&1 -- cgit v1.2.3 From 34b70e943b9b8b133434ab7705e2543feee85c8c Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Thu, 26 Jun 2008 16:52:58 +0000 Subject: => display text saying the domain-name received from dhcp-server is overridden by domain-name set in our CLI in op-mode command 'show dhcp client leases' --- scripts/vyatta-show-dhclient.pl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/vyatta-show-dhclient.pl b/scripts/vyatta-show-dhclient.pl index b696f8f..a158598 100755 --- a/scripts/vyatta-show-dhclient.pl +++ b/scripts/vyatta-show-dhclient.pl @@ -122,7 +122,14 @@ sub dhclient_show_lease { } } print "subnet mask: $new_subnet_mask\n" if defined $new_subnet_mask; - print "domain name: $new_domain_name\n" if defined $new_domain_name; + if (defined $new_domain_name) { + print "domain name: $new_domain_name"; + if (`grep domain /etc/resolv.conf 2> /dev/null`) { + print "\t[overridden by domain-name set using CLI]\n"; + } else { + print "\n"; + } + } print "router : $new_routers\n" if defined $new_routers; print "name server: $new_domain_name_servers\n" if defined $new_domain_name_servers; -- cgit v1.2.3