pf-tools commit: r732 [parmelan-guest] - in /trunk: debian/control lib/PFTools/Net.pm tools/umlaunch
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Thu Dec 10 13:11:13 UTC 2009
Author: parmelan-guest
Date: Thu Dec 10 13:11:10 2009
New Revision: 732
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=732
Log:
style (old, but was not committed)
Modified:
trunk/debian/control
trunk/lib/PFTools/Net.pm
trunk/tools/umlaunch
Modified: trunk/debian/control
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/control?rev=732&op=diff
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Thu Dec 10 13:11:10 2009
@@ -9,7 +9,6 @@
Package: pf-tools
Architecture: all
Depends: perl, libmd5-perl, cvs, ssh, iproute, debconf, psmisc
-Recommends: vlan, bridge-utils, uml-utilities (>= 20030605-2), screen
Description: Outils de gestion de la plateforme
Mise a jour automatique et generation de conf.
Deploiement de machines.
Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=732&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Thu Dec 10 13:11:10 2009
@@ -1654,17 +1654,19 @@
{
next if ( $nam eq 'dhcp' );
- print "\nauto ", $M->{'ifup'}->{$nam}, "\n";
- print "iface ", $M->{'ifup'}->{$nam}, " inet static\n";
+ my $iface = $M->{'ifup'}->{$nam};
+
+ print "\nauto $iface\n";
+ print "iface $iface inet static\n";
my $net = $nam;
$net =~ s/^[^\.]+\.//;
my $NET = $Z->{'NETWORK'}->{'BY_NAME'}->{$net};
- if ( $M->{'bonding'}->{ $M->{'ifup'}->{$nam} } ) {
+ if ( $M->{'bonding'}->{$iface} ) {
print
"\tslaves ",
- join ( " ", @{$M->{'bonding'}->{$M->{'ifup'}->{$nam}}} ),
+ join(' ', @{ $M->{'bonding'}->{$iface} }),
"\n" ;
}
@@ -1690,110 +1692,90 @@
}
my $defaultmtu = ($PFTOOLS_VARS->{'UML'}) ? 1496 : 1500;
- if ( $M->{'ifup'}->{$nam} =~ m/^([^:.]+)\.(\d+)(:\d+)?$/ ) {
+ if ( $iface =~ m/^([^:.]+)\.(\d+)(:\d+)?$/ ) {
my $ifname = $1;
my $iftag = $2;
- print "\tvlan_raw_device " . $ifname . "\n";
+ print "\tvlan_raw_device $ifname\n";
$defaultmtu = 1496;
- if ( defined( $NET->{'tag'} ) && $NET->{'tag'} != $iftag ) {
+ if ( defined $NET->{'tag'} and $NET->{'tag'} != $iftag ) {
Warn( $ERR_SYNTAX,
- "Les tags de "
- . $M->{'ifup'}->{$nam}
- . " et de "
- . $net
- . " different ("
- . $iftag . "!="
- . $NET->{'tag'}
- . ")!" );
- }
- }
-
- if ( defined( $NET->{'mtu'} ) ) {
+ "Les tags de $iface et de $net different ($iftag != $NET->{'tag'})!" );
+ }
+ }
+
+ if ( defined $NET->{'mtu'} ) {
$defaultmtu = $NET->{'mtu'};
}
- print "\tup ifconfig "
- . $M->{'ifup'}->{$nam} . " mtu "
- . (
- ( defined( $M->{'mtu'}->{ $M->{'ifup'}->{$nam} } ) )
- ? $M->{'mtu'}->{ $M->{'ifup'}->{$nam} }
- : $defaultmtu
- )
- . " "
- . (
- ( defined( $M->{'noarp'}->{ $M->{'ifup'}->{$nam} } ) ) ? "-arp"
- : "arp"
- ) . "\n";
+ print "\tup ifconfig $iface mtu ",
+ defined $M->{'mtu'}->{$iface} ? $M->{'mtu'}->{$iface} : $defaultmtu,
+ " ",
+ defined $M->{'noarp'}->{$iface} ? "-arp" : "arp",
+ "\n";
my $defaultmedia = "autoneg on";
- if ( defined( $NET->{'media'} ) ) {
+ if ( defined $NET->{'media'} ) {
$defaultmedia = $NET->{'media'};
}
- if ( defined( $M->{'media'}->{ $M->{'ifup'}->{$nam} } ) ) {
- $defaultmedia = $M->{'media'}->{ $M->{'ifup'}->{$nam} };
- }
-
- my @defaultmedia = split( ' ', $defaultmedia );
+ if ( defined $M->{'media'}->{$iface} ) {
+ $defaultmedia = $M->{'media'}->{$iface};
+ }
+
+ my @defaultmedia = split ' ', $defaultmedia;
my $mediaerror = 0;
- while ( $#defaultmedia >= 0 ) {
+ while ( @defaultmedia ) {
my $mediaopt = shift @defaultmedia;
my $mediaval = shift @defaultmedia;
- if ( !defined $mediaopt || !defined $mediaval ) {
- Warn( $ERR_SYNTAX, "Media syntax error: " . $defaultmedia );
+ unless ( defined $mediaopt and defined $mediaval ) {
+ Warn( $ERR_SYNTAX, "Media syntax error: $defaultmedia" );
$mediaerror = 1;
next;
}
if ( $mediaopt eq 'speed' ) {
- if ( $mediaval !~ m/^\d+$/ ) {
- Warn( $ERR_SYNTAX,
- "Media syntax error: " . $defaultmedia );
+ unless ( $mediaval =~ m/^\d+$/ ) {
+ Warn( $ERR_SYNTAX, "Media syntax error: $defaultmedia" );
$mediaerror = 1;
next;
}
}
elsif ( $mediaopt eq 'duplex' ) {
- if ( $mediaval !~ m/^(half|full)$/ ) {
- Warn( $ERR_SYNTAX,
- "Media syntax error: " . $defaultmedia );
+ unless ( $mediaval =~ m/^(half|full)$/ ) {
+ Warn( $ERR_SYNTAX, "Media syntax error: $defaultmedia" );
$mediaerror = 1;
next;
}
}
elsif ( $mediaopt eq 'autoneg' ) {
- if ( $mediaval !~ m/^(on|off)$/ ) {
- Warn( $ERR_SYNTAX,
- "Media syntax error: " . $defaultmedia );
+ unless ( $mediaval =~ m/^(on|off)$/ ) {
+ Warn( $ERR_SYNTAX, "Media syntax error: $defaultmedia" );
$mediaerror = 1;
next;
}
}
else {
- Warn( $ERR_SYNTAX, "Media syntax error: " . $defaultmedia );
+ Warn( $ERR_SYNTAX, "Media syntax error: $defaultmedia" );
$mediaerror = 1;
next;
}
}
if ( !$mediaerror ) {
- my $ifname = $M->{'ifup'}->{$nam};
+ my $ifname = $iface;
my $iftag;
if ( $ifname =~ m/^([^:.]+)\.(\d+)(:\d+)?$/ ) {
$ifname = $1;
$iftag = $2;
}
unless ( $M->{'bonding'}->{$ifname} || $iftag ) {
- print "\tup ethtool -s "
- . $ifname . " "
- . $defaultmedia
- . " || true\n";
- }
- }
-
- Mk_routes( $M, $Z, $M->{'ifup'}->{$nam} );
+ print "\tup ethtool -s $ifname $defaultmedia || true\n";
+ }
+ }
+
+ Mk_routes( $M, $Z, $iface );
}
print "\n";
Modified: trunk/tools/umlaunch
URL: http://svn.debian.org/wsvn/pf-tools/trunk/tools/umlaunch?rev=732&op=diff
==============================================================================
--- trunk/tools/umlaunch (original)
+++ trunk/tools/umlaunch Thu Dec 10 13:11:10 2009
@@ -34,9 +34,8 @@
$PFTools::Conf::PFTOOLS_VARS->{'UML'} = 1;
-# RAM par d�faut pour les UML en Mo
-my $mem = "128";
-my $disksize = "768";
+my $mem = "128"; # Default RAM size (MB)
+my $disksize = "768"; # Default disz size (MB)
my $ETHTRUNK = 'eth1';
@@ -85,9 +84,9 @@
print STDERR
"\t --branche-cvs permet l'utilisation d'une branche specifique\n";
print STDERR
- "\t-m --mem=XXX volume de RAM pour l'UML en Mo, d�faut ($mem Mo)\n";
- print STDERR
- "\t --disksize=XXX taille de l'image disque en Mo, d�faut ($disksize Mo)\n";
+ "\t-m --mem=XXX volume de RAM pour l'UML en Mo, defaut ($mem Mo)\n";
+ print STDERR
+ "\t --disksize=XXX taille de l'image disque en Mo, defaut ($disksize Mo)\n";
exit 1;
}
More information about the pf-tools-commits
mailing list