diff options
| -rwxr-xr-x | functions/tech-support | 3 | ||||
| -rwxr-xr-x | scripts/vyatta-show-dhclient.pl | 9 |
2 files changed, 11 insertions, 1 deletions
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 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; |