pf-tools/pf-tools: 2 new changesets

[parmelan-guest at users.alioth.debian.org]

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/6b9560ad03fb
changeset: 1269:6b9560ad03fb
user:      shad
date:      Fri Apr 11 16:34:47 2014 +0200
description:
more explicit error

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/73cf29e22abb
changeset: 1270:73cf29e22abb
user:      shad
date:      Fri Apr 11 16:35:25 2014 +0200
description:
it will be hard to keep track of all kind of console

diffstat:

 doc/hostfile-syntax        |  2 +-
 lib/PFTools/Conf/Host.pm   |  5 +++--
 lib/PFTools/Conf/Syntax.pm |  4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 9564aa50a6b3 -r 73cf29e22abb doc/hostfile-syntax
--- a/doc/hostfile-syntax	Thu Apr 10 15:38:18 2014 +0200
+++ b/doc/hostfile-syntax	Fri Apr 11 16:35:25 2014 +0200
@@ -38,7 +38,7 @@
 	? kerneluml[.%HOSTNUM%]		::= <KERNEL_FILENAME> this filename is searched into the kernel tftp directory define in pf-tools.conf for UML hosts
 	? initrduml[.%HOSTNUM%]		::= <INITRD_FILENAME> this filename is searched into the kernel tftp directory define in pf-tools.conf
 	? cmdline[.%HOSTNUM%]		::= misc options on cmdline see kernel docs
-	? console[.%HOSTNUM%]		::= [default|ttyS0,115200n8]
+	? console[.%HOSTNUM%]		::= 
 	? eth_order			::= comma separated list of links as defined in section name link::<NETWORK_NAME>
 
 [dns]
diff -r 9564aa50a6b3 -r 73cf29e22abb lib/PFTools/Conf/Host.pm
--- a/lib/PFTools/Conf/Host.pm	Thu Apr 10 15:38:18 2014 +0200
+++ b/lib/PFTools/Conf/Host.pm	Fri Apr 11 16:35:25 2014 +0200
@@ -612,7 +612,7 @@
     my $ip_address
         = NetAddr::IP->new( $prefix . $ipstart, $subnet_ref->mask() );
     if ( !$ip_address ) {
-        croak qq{ERROR: Invalid IP with $prefix and $ipstart};
+        croak qq{ERROR: Invalid IP with prefix='$prefix' and ipstart='$ipstart'};
     }
 
     if ($hostnum) {
@@ -624,7 +624,8 @@
     if ( defined $host_addr_site->{ $ip_address->cidr() } ) {
         croak q{ERROR: }
             . $ip_address->addr()
-            . qq{ already defined on site $site_name};
+            . qq{ already defined on site $site_name by }
+            . $host_addr_site->{ $ip_address->cidr() };
     }
     if ( !$subnet_ref->contains($ip_address) ) {
         croak q{ERROR: }
diff -r 9564aa50a6b3 -r 73cf29e22abb lib/PFTools/Conf/Syntax.pm
--- a/lib/PFTools/Conf/Syntax.pm	Thu Apr 10 15:38:18 2014 +0200
+++ b/lib/PFTools/Conf/Syntax.pm	Fri Apr 11 16:35:25 2014 +0200
@@ -184,7 +184,7 @@
             'kerneluml'      => 'undefined',
             'initrduml'      => 'undefined',
             'cmdline'        => 'undefined',
-            'console'        => '(default|ttyS0,115200n8)',
+            'console'        => 'undefined',
         },
         'dns' => {
             'MANDATORY_KEYS' => ['resolver'],
@@ -219,7 +219,7 @@
             'state'          => 'ROOT|EDGE',
             'dhcpvlan'       => '[\w\-]+',
             'prefix'         => '\w+',
-            'console' => '(default|ttyS0,115200n8)',
+            'console'        => 'undefined',
         },
         'network' => {
             'MANDATORY_KEYS' => [ 'network', 'site' ],