pf-tools commit: r658 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog filters/filter_distrib lib/PFTools/Conf.pm sbin/mk_sourceslist
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Wed Oct 8 14:57:00 UTC 2008
Author: ccaillet-guest
Date: Wed Oct 8 14:57:00 2008
New Revision: 658
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=658
Log:
* Features enhacement version
* Adding Init_SUBST in Conf.pm for initialzing Susbt_vars HASH structure,
which now permits to use correctly a fake hostname and domainname
* Using the new mechanism Init_SUBST into mk_sourceslist when using fake
host by --host parameter
* Avoiding hardcoded value in filter_distrib and mk_sourcelist by using
Init_SUBST mechanism
Modified:
branches/0.33-stable/debian/changelog
branches/0.33-stable/filters/filter_distrib
branches/0.33-stable/lib/PFTools/Conf.pm
branches/0.33-stable/sbin/mk_sourceslist
Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=658&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Wed Oct 8 14:57:00 2008
@@ -1,3 +1,15 @@
+pf-tools (0.33.10-1ubuntu1) intrepid; urgency=low
+
+ * Features enhacement version
+ * Adding Init_SUBST in Conf.pm for initialzing Susbt_vars HASH structure,
+ which now permits to use correctly a fake hostname and domainname
+ * Using the new mechanism Init_SUBST into mk_sourceslist when using fake
+ host by --host parameter
+ * Avoiding hardcoded value in filter_distrib and mk_sourcelist by using
+ Init_SUBST mechanism
+
+ -- Christophe Caillet <tof at sitadelle.com> Wed, 08 Oct 2008 16:50:56 +0200
+
pf-tools (0.33.9-1) unstable; urgency=low
* Bugfix release
Modified: branches/0.33-stable/filters/filter_distrib
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/filters/filter_distrib?rev=658&op=diff
==============================================================================
--- branches/0.33-stable/filters/filter_distrib (original)
+++ branches/0.33-stable/filters/filter_distrib Wed Oct 8 14:57:00 2008
@@ -59,8 +59,7 @@
}
my $PF_NET = Init_lib_net( Get_source("GLOBAL:private-network") ) ;
-$host =~ /^(([^\-]{4})-)?([^\d]+)(([\d]*)([a-z]*))?$/ ;
-my $hosttype = ( defined $1 ) ? $1.$3 : $3 ;
+my $hosttype = $SUBST{'HOSTTYPE'} ;
my $host_distrib = $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$hosttype}->{'SRVLIST'}->{$host}->{'distrib'} ;
my $host_distsrc = $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$hosttype}->{'SRVLIST'}->{$host}->{'deploymode'} ;
$host_distsrc =~ s/^(debian|ubuntu)-installer$/$1/ ;
Modified: branches/0.33-stable/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Conf.pm?rev=658&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Conf.pm (original)
+++ branches/0.33-stable/lib/PFTools/Conf.pm Wed Oct 8 14:57:00 2008
@@ -34,6 +34,7 @@
$DEFERREDLOG
%SUBST
+ Init_SUBST
Subst_vars
Load_conf
deferredlogsystem
@@ -64,47 +65,46 @@
my $FAKEDOMAINNAME;
our $DEFERREDLOG = 0;
-if ( defined($FAKEHOSTNAME) ) {
- $SUBST{'HOSTNAME'} = $FAKEHOSTNAME;
-}
-else {
- chomp( $SUBST{'HOSTNAME'} = `/bin/hostname -s 2>>/dev/null` );
-}
-
-if ( defined($FAKEDOMAINNAME) ) {
- $SUBST{'DOMAINNAME'} = $FAKEDOMAINNAME;
-}
-else {
- if ( -x "/bin/domainname" ) {
- chomp( $SUBST{'DOMAINNAME'} = `/bin/domainname 2>>/dev/null` );
- }
- elsif ( -x "/bin/dnsdomainname" ) {
- chomp( $SUBST{'DOMAINNAME'} = `/bin/dnsdomainname 2>>/dev/null` );
- }
- else {
- $SUBST{'DOMAINNAME'} = "";
- }
-}
-
-chomp( $SUBST{'OS_RELEASE'} = `/bin/uname -r` );
-
-$SUBST{'HOSTNAME'} =~ m/^((([a-z]{3}[\d]{1})-)?([a-z\-]+))([\d]*)([a-z]*)$/;
-
-$SUBST{'HOSTTYPE'} = $1;
-$SUBST{'HOSTDIGITS'} = $5;
-$SUBST{'HOSTCLUSTER'} = $4 . $5;
-$SUBST{'HOSTNODEINDEX'} = $6;
-$SUBST{'POPNAME'} = $3;
-
-$SUBST{'HOSTNUM'} = $SUBST{'HOSTDIGITS'};
-$SUBST{'HOSTNUM'} =~ s/^0*//;
-if ( $SUBST{'HOSTNUM'} eq "" ) {
- $SUBST{'HOSTNUM'} = 0;
-}
-
-$SUBST{'HOSTMINUTE'} = $SUBST{'HOSTNUM'} % 60;
-
-$SUBST{'HOSTHOUR'} = $SUBST{'HOSTNUM'} % 24;
+sub Init_SUBST ($;$$) {
+ my ( $ref_subst, $fakehost, $fakedomain ) = @_ ;
+
+ if ( defined $fakehost && ! defined $fakedomain ) {
+ warn "Unable to init substitution hash for hostname ".$fakehost."\n" ;
+ return ;
+ }
+ elsif ( defined $fakehost ) {
+ $ref_subst->{'HOSTNAME'} = $fakehost ;
+ $ref_subst->{'DOMAINNAME'} = $fakedomain ;
+ }
+ else {
+ chomp ( $ref_subst->{'HOSTNAME'} = `/bin/hostname -s 2>>/dev/null` ) ;
+ if ( -x "/bin/domainname" ) {
+ chomp( $ref_subst->{'DOMAINNAME'} = `/bin/domainname 2>>/dev/null` );
+ }
+ elsif ( -x "/bin/dnsdomainname" ) {
+ chomp( $ref_subst->{'DOMAINNAME'} = `/bin/dnsdomainname 2>>/dev/null` );
+ }
+ else {
+ $ref_subst->{'DOMAINNAME'} = "";
+ }
+ }
+ chomp ( $ref_subst->{'OS_RELEASE'} = `/bin/uname -r` ) ;
+ $ref_subst->{'HOSTNAME'} =~ m/^((([a-z]{3}[\d]{1})-)?([a-z\-]+))([\d]*)([a-z]*)$/ ;
+ $ref_subst->{'HOSTTYPE'} = $1 ;
+ $ref_subst->{'HOSTDIGITS'} = $5 ;
+ $ref_subst->{'HOSTCLUSTER'} = $4.$5 ;
+ $ref_subst->{'HOSTNODEINDEX'} = $6 ;
+ $ref_subst->{'POPNAME'} = $3 ;
+ $ref_subst->{'HOSTNUM'} = $ref_subst->{'HOSTDIGITS'} ;
+ $ref_subst->{'HOSTNUM'} =~ s/^0*// ;
+ if ( $ref_subst->{'HOSTNUM'} eq "" ) {
+ $ref_subst->{'HOSTNUM'} = 0 ;
+ }
+ $ref_subst->{'HOSTMINUTE'} = $ref_subst->{'HOSTNUM'} % 60 ;
+ $ref_subst->{'HOSTHOUR'} = $ref_subst->{'HOSTNUM'} % 24 ;
+}
+
+Init_SUBST ( \%SUBST ) ;
# PFTools variables define in configuration files
our $PFTOOLS_VARS = {} ;
Modified: branches/0.33-stable/sbin/mk_sourceslist
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_sourceslist?rev=658&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_sourceslist (original)
+++ branches/0.33-stable/sbin/mk_sourceslist Wed Oct 8 14:57:00 2008
@@ -36,7 +36,7 @@
my $DST = "" ;
my $TPL = "/usr/share/pf-tools/templates/sources.list.tpl" ;
my $SECTIONS = "common" ;
-my $HOST = `/bin/hostname -s 2>>/dev/null` ;
+my $HOST = '' ;
my $BACKPORTS = 0 ;
my $DEF_SECTIONS = {} ;
@@ -117,13 +117,11 @@
my $back_sections ;
if ( $dist_src eq 'debian' ) {
$back_src = $dist_src."-backports" ;
- $back_sections = "main contrib non-free" ;
}
elsif ( $dist_src eq 'ubuntu' ) {
$back_src = $dist_src ;
- $back_sections = "main universe restricted multiverse" ;
}
- $sources_content .= "\ndeb http://mirrors.private/".$back_src." ".$ref_srv->{'distrib'}."-backports ".$back_sections."\n" ;
+ $sources_content .= "\ndeb http://mirrors.private/".$back_src." ".$ref_srv->{'distrib'}."-backports ".$DEF_SECTIONS->{$dist_src}."\n" ;
}
if ( ! open ( DST, ">".$dst ) ) {
@@ -158,8 +156,17 @@
if ( @ARGV ) { $SECTIONS .= " ".join ( " ", @ARGV ) ; }
my $PF_NET = Init_lib_net ( Get_source ( $SRC ) ) ;
-$HOST =~ /^(([^\-]{4})-)?([^\d]+)(([\d]*)([a-z]*))?$/ ;
-my $hosttype = ( defined $1 ) ? $1.$3 : $3 ;
-my $SRV = $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$1.$3}->{'SRVLIST'}->{$HOST} ;
+
+my $hosttype ;
+if ( $HOST ne '' ) {
+ my %tmp_subst ;
+ Init_SUBST ( \%tmp_subst, $HOST, 'private' ) ;
+ $hosttype = $tmp_subst{'HOSTTYPE'} ;
+}
+else {
+ $HOST = $SUBST{'HOSTNAME'} ;
+ $hosttype = $SUBST{'HOSTTYPE'} ;
+}
+my $SRV = $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$hosttype}->{'SRVLIST'}->{$HOST} ;
Mk_sourceslist ( $SRV, $DST, $TPL, $SECTIONS ) ;
More information about the pf-tools-commits
mailing list