pf-tools commit: r563 [ccaillet-guest] - in /trunk: debian/changelog lib/PFTools/Conf.pm lib/PFTools/Net.pm sbin/mk_dhcp
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Fri Jan 18 16:17:42 UTC 2008
Author: ccaillet-guest
Date: Fri Jan 18 16:17:41 2008
New Revision: 563
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=563
Log:
* extracting Mk_dhcp from Net.pm to mk_dhcp which is only used here
* exporting $UML and $VMWARE and Get_dns_from_zone on Net.pm
* adding use strict on Net.pm and Conf.pm (WIP)
Modified:
trunk/debian/changelog
trunk/lib/PFTools/Conf.pm
trunk/lib/PFTools/Net.pm
trunk/sbin/mk_dhcp
Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=563&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Fri Jan 18 16:17:41 2008
@@ -14,6 +14,9 @@
* adding use strict on mk_pxelinuxcfg
* function Load_conf from Conf.pm now supports "use strict"
* forward port console parameter from "0.32-stable" branch
+ * extracting Mk_dhcp from Net.pm to mk_dhcp which is only used here
+ * exporting $UML and $VMWARE and Get_dns_from_zone on Net.pm
+ * adding use strict on Net.pm and Conf.pm (WIP)
[ Thomas Parmelan ]
* lib-net: if no comment is specified in a zone, network or server
@@ -24,7 +27,7 @@
made mistakes...
* Update my email address.
- -- Christophe Caillet <quadchris at free.fr> Fri, 18 Jan 2008 16:40:05 +0100
+ -- Christophe Caillet <quadchris at free.fr> Fri, 18 Jan 2008 17:14:33 +0100
pf-tools (0.32.46-1) unstable; urgency=low
Modified: trunk/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Conf.pm?rev=563&op=diff
==============================================================================
--- trunk/lib/PFTools/Conf.pm (original)
+++ trunk/lib/PFTools/Conf.pm Fri Jan 18 16:17:41 2008
@@ -22,7 +22,7 @@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
##
-# use strict;
+use strict;
use warnings;
use Exporter;
Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=563&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Fri Jan 18 16:17:41 2008
@@ -22,7 +22,7 @@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
##
-# use strict;
+use strict;
use warnings;
use Exporter;
@@ -30,15 +30,18 @@
our @ISA = ('Exporter');
our @EXPORT = qw(
+ $VMWARE
+ $UML
+
Init_lib_net
Get_Active_Filename
Get_dns_from_hostname
+ Get_dns_from_zone
Get_Ramdisk_size_from_Initrd
Get_If
Resolv
- Mk_dhcp
Mk_interfaces
Mk_zone
);
@@ -1485,162 +1488,6 @@
return ( join( '.', @r ) );
}
-sub Mk_dhcp {
- my ( $head, $fic, $Z ) = @_;
- my $oldout;
- my $vlan;
- my $s;
-
- my $dhcpvlanregex
- = '^([^.]+)\.('
- . join( '|', @{ $Z->{'SOA'}->{'dhcpvlan'} } )
- . ')(\.*)?$';
-
- open( FIC, ">" . $fic ) || die "Cannot open " . $fic . " : " . $!;
- $oldout = select(FIC);
-
- open( HEAD, "<" . $head ) || die "Cannot open " . $head . " : " . $!;
-
- while (<HEAD>) {
- print;
- }
-
- close(HEAD);
-
- print "\n";
-
- foreach $vlan ( @{ $Z->{'SOA'}->{'dhcpvlan'} } ) {
- printf( "# %s\n",
- $Z->{'NETWORK'}->{'BY_NAME'}->{$vlan}->{'comment'} );
- printf(
- "subnet %s netmask %s {\n}\n\n",
- $Z->{'NETWORK'}->{'BY_NAME'}->{$vlan}->{'network'},
- $Z->{'NETWORK'}->{'BY_NAME'}->{$vlan}->{'netmask'}
- );
- }
-
- print "\n";
-
- foreach $s ( sort ( keys %{ $Z->{'SERVERS'}->{'BY_ADDR'} } ) ) {
- my $m;
- my $N = $Z->{'SERVERS'}->{'BY_ADDR'}->{$s};
-
- print "# ", $N->{'comment'}, "\n";
- print "# number: ", $N->{'number'}, "\n";
- print "# nodes: ", $N->{'nodes'}, "\n"
- if ( defined( $N->{'nodes'} ) && $N->{'nodes'} > 1 );
- print "\n";
-
- foreach $m ( sort ( keys %{ $N->{'SRVLIST'} } ) ) {
- my $nam;
- my $M = $N->{'SRVLIST'}->{$m};
-
- foreach $nam ( sort ( keys %{ $M->{'zone'} } ) ) {
- if ( $nam =~ /$dhcpvlanregex/ ) {
- my $nam2 = $1;
-
- #my $vlan2 = $2;
-
- my $hostnum = $nam2;
- $hostnum =~ s/^.*?(\d*)[a-z]*$/$1/;
- $hostnum =~ s/^0*//;
- if ( $hostnum eq "" ) {
- $hostnum = 0;
- }
-
- if ( defined( $M->{'zone'}->{$nam}->{'ether'} ) ) {
- printf( "host %s {\n", $nam2 );
- printf( " hardware ethernet %s;\n",
- $M->{'zone'}->{$nam}->{'ether'} );
- printf( " fixed-address %s.%s;\n",
- $nam, $Z->{'SOA'}->{'name'} );
-
- if ( defined( $M->{'filename'} )
- && $M->{'filename'} ne "" )
- {
- printf( " filename \"%s\";\n",
- $M->{'filename'} );
- }
-
- if ( $M->{'initrd'} ) {
- printf qq{# initrd "%s";\n}, $M->{'initrd'};
- }
-
- if ( $M->{'cmdline'} ) {
- printf qq{# cmdline "%s";\n}, $M->{'cmdline'};
- }
-
- if ( $M->{console} ) {
- printf qq{# console "%s";\n}, $M->{console};
- }
-
- if ( defined( $M->{'pxefilename'} )
- && $M->{'pxefilename'} ne "" )
- {
- printf( "# pxefilename \"%s\";\n",
- $M->{'pxefilename'} );
- }
-
- if ( defined( $M->{'pxelinuxconf'} )
- && $M->{'pxelinuxconf'} ne "" )
- {
- printf( " option option-209 \"%s\";\n",
- $M->{'pxelinuxconf'} );
- }
-
- my @dns = Get_dns_from_zone( $Z, $M, $hostnum );
-
- if ( $#dns >= 0 && defined $dns[0] ) {
- printf( " option domain-name-servers %s;\n",
- join( ", ", @dns ) );
- }
-
- print "}\n\n";
- }
- if ( defined( $M->{'zone'}->{$nam}->{'vmether'} )
- && ( $VMWARE || $UML ) )
- {
- printf( "host %s {\n", $nam2 );
- printf( " hardware ethernet %s;\n",
- $M->{'zone'}->{$nam}->{'vmether'} );
- printf( " fixed-address %s.%s;\n",
- $nam, $Z->{'SOA'}->{'name'} );
-
- if ( defined( $M->{'vmwfilename'} )
- && $M->{'vmwfilename'} ne "" )
- {
- printf( " filename \"%s\";\n",
- $M->{'vmwfilename'} );
- }
-
- if ( defined( $M->{'pxelinuxconf'} )
- && $M->{'pxelinuxconf'} ne "" )
- {
- printf( " option option-209 \"%s\";\n",
- $M->{'pxelinuxconf'} );
- }
-
- my @dns = Get_dns_from_zone( $Z, $M, $hostnum );
-
- if ( $#dns >= 0 && defined $dns[0] ) {
- printf( " option domain-name-servers %s;\n",
- join( ", ", @dns ) );
- }
-
- print "}\n\n";
- }
- }
- }
- }
- print "\n";
- }
-
- $| = 1;
- select($oldout);
- close(FIC);
-}
-
-
sub Mk_zoneheader {
my ( $fic_zone, $Z ) = @_;
my $m;
Modified: trunk/sbin/mk_dhcp
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_dhcp?rev=563&op=diff
==============================================================================
--- trunk/sbin/mk_dhcp (original)
+++ trunk/sbin/mk_dhcp Fri Jan 18 16:17:41 2008
@@ -2,6 +2,7 @@
##
## $Id$
##
+## Copyright (C) 2007-2008 Christophe Caillet <quadchris at free.fr>
## Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
## Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
##
@@ -26,6 +27,160 @@
use PFTools::Net;
use PFTools::Update;
+sub Mk_dhcp {
+ my ( $head, $fic, $Z ) = @_;
+ my $oldout;
+ my $vlan;
+ my $s;
+
+ my $dhcpvlanregex
+ = '^([^.]+)\.('
+ . join( '|', @{ $Z->{'SOA'}->{'dhcpvlan'} } )
+ . ')(\.*)?$';
+
+ open( FIC, ">" . $fic ) || die "Cannot open " . $fic . " : " . $!;
+ $oldout = select(FIC);
+
+ open( HEAD, "<" . $head ) || die "Cannot open " . $head . " : " . $!;
+
+ while (<HEAD>) {
+ print;
+ }
+
+ close(HEAD);
+
+ print "\n";
+
+ foreach $vlan ( @{ $Z->{'SOA'}->{'dhcpvlan'} } ) {
+ printf( "# %s\n",
+ $Z->{'NETWORK'}->{'BY_NAME'}->{$vlan}->{'comment'} );
+ printf(
+ "subnet %s netmask %s {\n}\n\n",
+ $Z->{'NETWORK'}->{'BY_NAME'}->{$vlan}->{'network'},
+ $Z->{'NETWORK'}->{'BY_NAME'}->{$vlan}->{'netmask'}
+ );
+ }
+
+ print "\n";
+
+ foreach $s ( sort ( keys %{ $Z->{'SERVERS'}->{'BY_ADDR'} } ) ) {
+ my $m;
+ my $N = $Z->{'SERVERS'}->{'BY_ADDR'}->{$s};
+
+ print "# ", $N->{'comment'}, "\n";
+ print "# number: ", $N->{'number'}, "\n";
+ print "# nodes: ", $N->{'nodes'}, "\n"
+ if ( defined( $N->{'nodes'} ) && $N->{'nodes'} > 1 );
+ print "\n";
+
+ foreach $m ( sort ( keys %{ $N->{'SRVLIST'} } ) ) {
+ my $nam;
+ my $M = $N->{'SRVLIST'}->{$m};
+
+ foreach $nam ( sort ( keys %{ $M->{'zone'} } ) ) {
+ if ( $nam =~ /$dhcpvlanregex/ ) {
+ my $nam2 = $1;
+
+ #my $vlan2 = $2;
+
+ my $hostnum = $nam2;
+ $hostnum =~ s/^.*?(\d*)[a-z]*$/$1/;
+ $hostnum =~ s/^0*//;
+ if ( $hostnum eq "" ) {
+ $hostnum = 0;
+ }
+
+ if ( defined( $M->{'zone'}->{$nam}->{'ether'} ) ) {
+ printf( "host %s {\n", $nam2 );
+ printf( " hardware ethernet %s;\n",
+ $M->{'zone'}->{$nam}->{'ether'} );
+ printf( " fixed-address %s.%s;\n",
+ $nam, $Z->{'SOA'}->{'name'} );
+
+ if ( defined( $M->{'filename'} )
+ && $M->{'filename'} ne "" )
+ {
+ printf( " filename \"%s\";\n",
+ $M->{'filename'} );
+ }
+
+ if ( $M->{'initrd'} ) {
+ printf qq{# initrd "%s";\n}, $M->{'initrd'};
+ }
+
+ if ( $M->{'cmdline'} ) {
+ printf qq{# cmdline "%s";\n}, $M->{'cmdline'};
+ }
+
+ if ( $M->{console} ) {
+ printf qq{# console "%s";\n}, $M->{console};
+ }
+
+ if ( defined( $M->{'pxefilename'} )
+ && $M->{'pxefilename'} ne "" )
+ {
+ printf( "# pxefilename \"%s\";\n",
+ $M->{'pxefilename'} );
+ }
+
+ if ( defined( $M->{'pxelinuxconf'} )
+ && $M->{'pxelinuxconf'} ne "" )
+ {
+ printf( " option option-209 \"%s\";\n",
+ $M->{'pxelinuxconf'} );
+ }
+
+ my @dns = Get_dns_from_zone( $Z, $M, $hostnum );
+
+ if ( $#dns >= 0 && defined $dns[0] ) {
+ printf( " option domain-name-servers %s;\n",
+ join( ", ", @dns ) );
+ }
+
+ print "}\n\n";
+ }
+ if ( defined( $M->{'zone'}->{$nam}->{'vmether'} )
+ && ( $VMWARE || $UML ) )
+ {
+ printf( "host %s {\n", $nam2 );
+ printf( " hardware ethernet %s;\n",
+ $M->{'zone'}->{$nam}->{'vmether'} );
+ printf( " fixed-address %s.%s;\n",
+ $nam, $Z->{'SOA'}->{'name'} );
+
+ if ( defined( $M->{'vmwfilename'} )
+ && $M->{'vmwfilename'} ne "" )
+ {
+ printf( " filename \"%s\";\n",
+ $M->{'vmwfilename'} );
+ }
+
+ if ( defined( $M->{'pxelinuxconf'} )
+ && $M->{'pxelinuxconf'} ne "" )
+ {
+ printf( " option option-209 \"%s\";\n",
+ $M->{'pxelinuxconf'} );
+ }
+
+ my @dns = Get_dns_from_zone( $Z, $M, $hostnum );
+
+ if ( $#dns >= 0 && defined $dns[0] ) {
+ printf( " option domain-name-servers %s;\n",
+ join( ", ", @dns ) );
+ }
+
+ print "}\n\n";
+ }
+ }
+ }
+ }
+ print "\n";
+ }
+
+ $| = 1;
+ select($oldout);
+ close(FIC);
+}
my ($HEAD, $SRC, $DST) = @ARGV;
unless ( $HEAD and $SRC and $DST ) {
More information about the pf-tools-commits
mailing list