pf-tools commit: r458 [parmelan-guest] - in /trunk: ./ conf/ debian/ filters/ lib/PFTools/ sbin/ tools/

parmelan-guest at users.alioth.debian.org parmelan-guest at users.alioth.debian.org
Mon Mar 5 18:08:42 CET 2007


Author: parmelan-guest
Date: Mon Mar  5 17:08:42 2007
New Revision: 458

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=458
Log:
misc fixes and moves

Added:
    trunk/debian/pf-host.postinst
      - copied unchanged from r457, trunk/debian/postinst
    trunk/tools/xenlaunch
      - copied unchanged from r457, trunk/xenlaunch
Removed:
    trunk/debian/postinst
    trunk/debian/postrm
    trunk/update-links
    trunk/xenlaunch
Modified:
    trunk/README.contributors
    trunk/conf/pf-tools.conf
    trunk/debian/pf-host.init
    trunk/filters/filter_filename
    trunk/filters/filter_privateresolve
    trunk/filters/filter_vlan2if
    trunk/lib/PFTools/Conf.pm
    trunk/lib/PFTools/Net.pm   (contents, props changed)
    trunk/lib/PFTools/Update.pm   (contents, props changed)
    trunk/sbin/mk_dhcp
    trunk/sbin/mk_interfaces
    trunk/sbin/mk_packages
    trunk/sbin/mk_privatezone
    trunk/sbin/mk_pxelinuxcfg
    trunk/sbin/mk_resolvconf
    trunk/sbin/update-config
    trunk/tools/dumpiplist.pl
    trunk/tools/umlaunch

Modified: trunk/README.contributors
URL: http://svn.debian.org/wsvn/pf-tools/trunk/README.contributors?rev=458&op=diff
==============================================================================
--- trunk/README.contributors (original)
+++ trunk/README.contributors Mon Mar  5 17:08:42 2007
@@ -2,6 +2,7 @@
 The following people have been very helpful to the development of pf-tools:
 
 Rached Ben Mustapha
+Christophe Caillet
 Damien Clermonte
 Maxime Henrion
 Gonéri Le Bouder

Modified: trunk/conf/pf-tools.conf
URL: http://svn.debian.org/wsvn/pf-tools/trunk/conf/pf-tools.conf?rev=458&op=diff
==============================================================================
--- trunk/conf/pf-tools.conf (original)
+++ trunk/conf/pf-tools.conf Mon Mar  5 17:08:42 2007
@@ -1,5 +1,5 @@
 $CVS_USER       = "cvsguest";
-$CVS_RSH        = "/usr/local/sbin/cvs_rsh";
+$CVS_RSH        = "/usr/sbin/cvs_rsh";
 $CVS_SERVER     = "cvs.private";
 $CVS_ROOT       = "/var/lib/cvs";
 $CVS_REPOSITORY = $CVS_ROOT . "/repository";

Modified: trunk/debian/pf-host.init
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/pf-host.init?rev=458&op=diff
==============================================================================
--- trunk/debian/pf-host.init (original)
+++ trunk/debian/pf-host.init Mon Mar  5 17:08:42 2007
@@ -4,8 +4,8 @@
 
 # Based on skeleton by Miquel van Smoorenburg and Ian Murdock
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-CMD=/usr/local/sbin/pflaunch
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+CMD=/usr/sbin/pflaunch
 NAME=pf-host
 SNAME=pf-host
 DESC="Plaforme"

Modified: trunk/filters/filter_filename
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_filename?rev=458&op=diff
==============================================================================
--- trunk/filters/filter_filename (original)
+++ trunk/filters/filter_filename Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 ##
 ##  $Id$
 ##

Modified: trunk/filters/filter_privateresolve
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_privateresolve?rev=458&op=diff
==============================================================================
--- trunk/filters/filter_privateresolve (original)
+++ trunk/filters/filter_privateresolve Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 ##
 ##  $Id$
 ##

Modified: trunk/filters/filter_vlan2if
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_vlan2if?rev=458&op=diff
==============================================================================
--- trunk/filters/filter_vlan2if (original)
+++ trunk/filters/filter_vlan2if Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 # eth:vlan -> ethx.y:z
 # eth.vlan -> ethx.y

Modified: trunk/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Conf.pm?rev=458&op=diff
==============================================================================
--- trunk/lib/PFTools/Conf.pm (original)
+++ trunk/lib/PFTools/Conf.pm Mon Mar  5 17:08:42 2007
@@ -19,22 +19,22 @@
 ##  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 ##
 
-use Exporter ;
-
- at ISA = ( 'Exporter' ) ;
-
- at EXPORT = qw (
+use strict;
+use warnings;
+
+use Exporter;
+
+our @ISA = ( 'Exporter' ) ;
+
+our @EXPORT = qw(
 	$DEFERREDLOG
 	%SUBST
 
 	Load_conf
-) ;
-
- at EXPORT_OK = qw (
-) ;
-
-use strict ;
-use warnings ;
+);
+
+our @EXPORT_OK = qw();
+
 
 # Error code
 my $ERR_OPEN	= 1 ;

Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=458&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Mon Mar  5 17:08:42 2007
@@ -19,11 +19,14 @@
 ##  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 ##
 
+use strict;
+use warnings;
+
 use Exporter ;
 
- at ISA = ( 'Exporter' ) ;
-
- at EXPORT = qw (
+our @ISA = ( 'Exporter' ) ;
+
+our @EXPORT = qw(
 	Init_lib_net
 
 	Get_Active_Filename
@@ -34,14 +37,10 @@
 	Mk_pxelinuxcfg
 	Mk_interfaces
 	Mk_zone
-) ;
-
- at EXPORT_OK = qw (
-) ;
-
-
-use strict;
-use warnings;
+);
+
+our @EXPORT_OK = qw();
+
 
 use Fcntl ':mode';
 use POSIX qw(ceil floor);

Propchange: trunk/lib/PFTools/Net.pm
            ('svn:executable' removed)

Modified: trunk/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Update.pm?rev=458&op=diff
==============================================================================
--- trunk/lib/PFTools/Update.pm (original)
+++ trunk/lib/PFTools/Update.pm Mon Mar  5 17:08:42 2007
@@ -19,19 +19,20 @@
 ##  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 ##
 
- at ISA = ( 'Exporter' ) ;
-
- at EXPORT = qw (
-	Get_source
-
-	Do_update
-) ;
-
- at EXPORT_OK = qw (
-) ;
-
 use strict;
 use warnings;
+
+use Exporter;
+
+our @ISA = ( 'Exporter' ) ;
+
+our @EXPORT = qw(
+	Get_source
+
+	Do_update
+);
+
+our @EXPORT_OK = qw();
 
 use PFTools::Conf ;
 use PFTools::Net ;

Propchange: trunk/lib/PFTools/Update.pm
            ('svn:executable' removed)

Modified: trunk/sbin/mk_dhcp
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_dhcp?rev=458&op=diff
==============================================================================
--- trunk/sbin/mk_dhcp (original)
+++ trunk/sbin/mk_dhcp Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 ##
 ##  $Id$
 ##
@@ -22,13 +22,9 @@
 use strict;
 use warnings;
 
-# Librairies
-#------------------
-use PFTools::Net ;
-use PFTools::Update ;
+use PFTools::Net;
+use PFTools::Update;
 
-# Globales
-#-------------
 
 if ( $#ARGV != 2 ) {
     print STDERR "Usage: $0 head src dest\n";

Modified: trunk/sbin/mk_interfaces
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_interfaces?rev=458&op=diff
==============================================================================
--- trunk/sbin/mk_interfaces (original)
+++ trunk/sbin/mk_interfaces Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 ##
 ##  $Id$
 ##
@@ -22,7 +22,7 @@
 use strict;
 use warnings;
 
-use PFTools::Net ;
+use PFTools::Net;
 
 if ( $#ARGV != 2 ) {
     print STDERR "Usage: $0 config host dest\n";

Modified: trunk/sbin/mk_packages
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_packages?rev=458&op=diff
==============================================================================
--- trunk/sbin/mk_packages (original)
+++ trunk/sbin/mk_packages Mon Mar  5 17:08:42 2007
@@ -19,8 +19,8 @@
 ##  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 ##
 
-use strict ;
-use warnings ;
+use strict;
+use warnings;
 
 if ( system("gzip -dc $ARGV[0] >/dev/null 2>&1") ) {
     print "Usage: $0 <Path/packages.gz>\n";

Modified: trunk/sbin/mk_privatezone
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_privatezone?rev=458&op=diff
==============================================================================
--- trunk/sbin/mk_privatezone (original)
+++ trunk/sbin/mk_privatezone Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 ##
 ##  $Id$
 ##
@@ -22,13 +22,9 @@
 use strict;
 use warnings;
 
-# Librairies
-#------------------
-use PFTools::Net ;
-use PFTools::Update ;
+use PFTools::Net;
+use PFTools::Update;
 
-# Globales
-#-------------
 
 if ( $#ARGV < 1 ) {
 

Modified: trunk/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_pxelinuxcfg?rev=458&op=diff
==============================================================================
--- trunk/sbin/mk_pxelinuxcfg (original)
+++ trunk/sbin/mk_pxelinuxcfg Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 ##
 ##  $Id$
 ##
@@ -22,13 +22,9 @@
 use strict;
 use warnings;
 
-# Librairies
-#------------------
-use PFTools::Net ;
-use PFTools::Update ;
+use PFTools::Net;
+use PFTools::Update;
 
-# Globales
-#-------------
 
 if ( $#ARGV != 1 ) {
     print STDERR "Usage: $0 src template\n";

Modified: trunk/sbin/mk_resolvconf
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_resolvconf?rev=458&op=diff
==============================================================================
--- trunk/sbin/mk_resolvconf (original)
+++ trunk/sbin/mk_resolvconf Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 ##
 ##  $Id$
 ##
@@ -22,8 +22,8 @@
 use strict;
 use warnings;
 
-use PFTools::Net ;
-use PFTools::Update ;
+use PFTools::Net;
+use PFTools::Update;
 
 if ( $#ARGV != 2 ) {
     print STDERR "Usage: $0 config host dest\n";

Modified: trunk/sbin/update-config
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/update-config?rev=458&op=diff
==============================================================================
--- trunk/sbin/update-config (original)
+++ trunk/sbin/update-config Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 ##
 ##  $Id$
 ##
@@ -22,9 +22,7 @@
 use strict;
 use warnings;
 
-# Librairies
-#------------------
-use PFTools::Update ;
+use PFTools::Update;
 
 Do_update(@ARGV);
 

Modified: trunk/tools/dumpiplist.pl
URL: http://svn.debian.org/wsvn/pf-tools/trunk/tools/dumpiplist.pl?rev=458&op=diff
==============================================================================
--- trunk/tools/dumpiplist.pl (original)
+++ trunk/tools/dumpiplist.pl Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 # liste toute les adresses ip depuis le fichier private-network
 # prend le fichier private-network en argument et un 1 en second 
 # argument si on souhaite avoir les adresses pour les uml (implique alteon00 surtout)
@@ -22,6 +22,10 @@
 
 
 use strict;
+use warnings;
+
+use PFTools::Net;
+use PFTools::Update;
 
 if ( @ARGV == 0 or @ARGV > 2)
 {
@@ -30,11 +34,8 @@
 }
 if ($ARGV[1])
 {
-	our $UML = 1;
+    $PFTools::Net::UML = 1;
 }
-
-use PFTools::Net ;
-use PFTools::Update ;
 
 sub _ipcomp 
 {

Modified: trunk/tools/umlaunch
URL: http://svn.debian.org/wsvn/pf-tools/trunk/tools/umlaunch?rev=458&op=diff
==============================================================================
--- trunk/tools/umlaunch (original)
+++ trunk/tools/umlaunch Mon Mar  5 17:08:42 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 #   $Id$
 #   $Name$
@@ -30,6 +30,8 @@
 use PFTools::Net ;
 use PFTools::Update ;
 
+$PFTools::Net::UML = 1;
+
 # RAM par défaut pour les UML en Mo
 my $mem      = "128";
 my $disksize = "768";
@@ -49,9 +51,6 @@
 
 `ifconfig $ETHTRUNK 2>/dev/null`;
 undef $ETHTRUNK if $?;
-
-# "our" et non "my" car cette variable est utilisée dans les lib-* :(
-our $UML = 1;
 
 
 my $options;




More information about the Pf-tools-commits mailing list