From 3a3609e5043f5afcef717c319ed9837c8587744f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 8 Oct 2010 17:12:41 -0700 Subject: 0.17.105 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 64afb1c4..70f126c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.17.105) unstable; urgency=low + + * Convert from syslog to rsyslog + + -- Stephen Hemminger Fri, 08 Oct 2010 17:12:41 -0700 + vyatta-cfg-system (0.17.104) unstable; urgency=low [ Stephen Hemminger ] -- cgit v1.2.3 From 3f3aa581bf8ad692675f7aed70ca5574b31a70e0 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Oct 2010 12:12:14 -0700 Subject: use new error reference location method --- scripts/system/vyatta_update_resolv.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/system/vyatta_update_resolv.pl b/scripts/system/vyatta_update_resolv.pl index 041292be..224d002d 100755 --- a/scripts/system/vyatta_update_resolv.pl +++ b/scripts/system/vyatta_update_resolv.pl @@ -47,8 +47,7 @@ if ($dhclient_script == 1) { } if ($dhclient_script == 0 && @domains > 0 && $domain_name && length($domain_name) > 0) { - print STDERR "System configuration error. Both \'domain-name\' and \'domain-search\' are specified, but only one of these mutually exclusive parameters is allowed.\n"; - print STDERR "System configuration commit aborted due to error(s).\n"; + $vc->outputError(["system domain-name","system domain-search"],"System configuration error. Both \'domain-name\' and \'domain-search\' are specified, but only one of these mutually exclusive parameters is allowed."); exit(1); } -- cgit v1.2.3 From 838e3db823fab634ce25149822b559f658110683 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Oct 2010 12:13:12 -0700 Subject: 0.17.106 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 70f126c1..14a371a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.17.106) unstable; urgency=low + + * use new error reference location method + + -- root Fri, 08 Oct 2010 12:13:11 -0700 + vyatta-cfg-system (0.17.105) unstable; urgency=low * Convert from syslog to rsyslog -- cgit v1.2.3 From fcd9207451d02f31464add8f1f73313f4e51a150 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Oct 2010 12:18:53 -0700 Subject: modified reference error location. --- scripts/system/vyatta_update_resolv.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/vyatta_update_resolv.pl b/scripts/system/vyatta_update_resolv.pl index 224d002d..6897c791 100755 --- a/scripts/system/vyatta_update_resolv.pl +++ b/scripts/system/vyatta_update_resolv.pl @@ -47,7 +47,7 @@ if ($dhclient_script == 1) { } if ($dhclient_script == 0 && @domains > 0 && $domain_name && length($domain_name) > 0) { - $vc->outputError(["system domain-name","system domain-search"],"System configuration error. Both \'domain-name\' and \'domain-search\' are specified, but only one of these mutually exclusive parameters is allowed."); + $vc->outputError(["system domain-name","system domain-search domain"],"System configuration error. Both \'domain-name\' and \'domain-search\' are specified, but only one of these mutually exclusive parameters is allowed."); exit(1); } -- cgit v1.2.3