diff options
| -rw-r--r-- | debian/changelog | 60 | ||||
| -rwxr-xr-x | functions/tech-support | 3 | ||||
| -rwxr-xr-x | scripts/vyatta-show-dhclient.pl | 22 | ||||
| -rw-r--r-- | templates/traceroute/node.tag/node.def | 2 |
4 files changed, 85 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b539a82..44675de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,63 @@ +vyatta-op (0.12) unstable; urgency=low + + 3.1.2 + [ Mark O'Brien ] + + + [ Mohit Mehta ] + * better detection of whether domain-name set using CLI is overriding + * => display text saying the domain-name received from dhcp-server + + [ An-Cheng Huang ] + * fix for bug 3451: add messages output + + [ Stephen Hemminger ] + * Turn on paging of tail when showing count lines + * Show files completion + + [ Mohit Mehta ] + * prevents showing backend error to user on traceroute when name- + server not set + * Fix Bug 2871 Internal errors reported with traceroute + + [ An-Cheng Huang ] + * fix for bug 3414: make op mode functions available in config mode. + + [ Mohit Mehta ] + * Fix Bug 1059 Feature Request: integrate 'tcpdump' and 'tethereal' + into Vyatta CLI + + [ Mark O'Brien ] + + -- Mark O'Brien <mobrien@firebolt.vyatta.com> Wed, 23 Jul 2008 21:36:10 -0700 + +vyatta-op (0.11) unstable; urgency=low + + 3.1.1 + [ Mark O'Brien ] + + + [ Mohit Mehta ] + * Fix Bug 1059 Feature Request: integrate 'tcpdump' and 'tethereal' + into Vyatta CLI + * Bug 3385 incomplete command 'run' in configure mode produces backend + error to user + * Fix Bug 3378 user "vyatta" got "permission denied" after executing + "renew dhcp ..." and/or "release dhcp ..." + + [ rbalocca ] + * Output was sometimes missing important white space + + [ Mohit Mehta ] + * added code for allowed values for op-mode dhcp release/renew lease + commands + * Fix bug 3059 Operator Level commands for DHCP client + * deleting op-command 'clear dhcp client process' as its handling + + [ Mark O'Brien ] + + -- Mark O'Brien <mobrien@firebolt.vyatta.com> Sat, 28 Jun 2008 11:22:25 -0700 + vyatta-op (0.10) unstable; urgency=low 3.1.0 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..0f3990b 100755 --- a/scripts/vyatta-show-dhclient.pl +++ b/scripts/vyatta-show-dhclient.pl @@ -122,7 +122,27 @@ 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"; + my $cli_domain_overrides = 0; + my $if_domain_exists = `grep domain /etc/resolv.conf 2> /dev/null | wc -l`; + if ($if_domain_exists > 0) { + my @domain = `grep domain /etc/resolv.conf`; + for my $each_domain_text_found (@domain) { + my @domain_text_split = split(/\t/, $each_domain_text_found, 2); + my $domain_at_start_of_line = $domain_text_split[0]; + chomp $domain_at_start_of_line; + if ($domain_at_start_of_line eq "domain") { + $cli_domain_overrides = 1; + } + } + } + if ($cli_domain_overrides == 1) { + 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; diff --git a/templates/traceroute/node.tag/node.def b/templates/traceroute/node.tag/node.def index 83a3f31..cf60ec4 100644 --- a/templates/traceroute/node.tag/node.def +++ b/templates/traceroute/node.tag/node.def @@ -12,7 +12,7 @@ run: /usr/bin/traceroute $2 echo else - if cat /etc/resolv.conf | grep -q nameserver + if cat /etc/resolv.conf 2> /dev/null | grep -q nameserver then if /usr/bin/host $2 &> /dev/null then |