pf-tools/pf-tools-0.33-stable: 4 new changesets
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Wed Oct 26 12:26:50 UTC 2011
details: http://hg.debian.org/hg/pf-tools/pf-tools-0.33-stable/rev/a8974d64b8cc
changeset: 548:a8974d64b8cc
user: Thomas Parmelan <tom at sitadelle.com>
date: Wed Oct 26 13:23:31 2011 +0200
description:
Work around Linux >= 2.6.39 adding a final slash to an NFS mount source in /proc/mounts.
details: http://hg.debian.org/hg/pf-tools/pf-tools-0.33-stable/rev/3e99041cbb83
changeset: 549:3e99041cbb83
user: Thomas Parmelan <tom at sitadelle.com>
date: Wed Oct 26 13:50:45 2011 +0200
description:
sbin/mk_pxelinuxcfg: remove the hardcoded '-grsec' suffix.
details: http://hg.debian.org/hg/pf-tools/pf-tools-0.33-stable/rev/87ffc2caf7c2
changeset: 550:87ffc2caf7c2
user: Thomas Parmelan <tom at sitadelle.com>
date: Wed Oct 26 13:57:09 2011 +0200
description:
releasing version 0.33.24-1
details: http://hg.debian.org/hg/pf-tools/pf-tools-0.33-stable/rev/76afd2e0da7b
changeset: 551:76afd2e0da7b
user: Thomas Parmelan <tom at sitadelle.com>
date: Wed Oct 26 13:57:31 2011 +0200
description:
tagging version 0.33.24-1
diffstat:
.hgtags | 1 +
debian/changelog | 8 ++++++++
lib/PFTools/Update.pm | 24 +++++++++++++++---------
sbin/mk_pxelinuxcfg | 14 ++------------
4 files changed, 26 insertions(+), 21 deletions(-)
diffs (98 lines):
diff -r 62698bacef00 -r 76afd2e0da7b .hgtags
--- a/.hgtags Thu Mar 24 12:28:36 2011 +0100
+++ b/.hgtags Wed Oct 26 13:57:31 2011 +0200
@@ -1,2 +1,3 @@
c8b620892c7dd95374cd81b205e1c323cbada277 0.33.21-1
82b295cfe2174230e2cb1cf3965970917ed92d75 0.33.22-1
+87ffc2caf7c2ab8f0e3e6ebb8fcac2af66d04673 0.33.24-1
diff -r 62698bacef00 -r 76afd2e0da7b debian/changelog
--- a/debian/changelog Thu Mar 24 12:28:36 2011 +0100
+++ b/debian/changelog Wed Oct 26 13:57:31 2011 +0200
@@ -1,3 +1,11 @@
+pf-tools (0.33.24-1) unstable; urgency=low
+
+ * Work around Linux >= 2.6.39 adding a final slash to an NFS mount source in
+ /proc/mounts.
+ * sbin/mk_pxelinuxcfg: remove the hardcoded '-grsec' suffix.
+
+ -- Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org> Wed, 26 Oct 2011 13:55:29 +0200
+
pf-tools (0.33.23-2) unstable; urgency=low
* Debian/control: changes on recommends which are for pf-hosts not for
diff -r 62698bacef00 -r 76afd2e0da7b lib/PFTools/Update.pm
--- a/lib/PFTools/Update.pm Thu Mar 24 12:28:36 2011 +0100
+++ b/lib/PFTools/Update.pm Wed Oct 26 13:57:31 2011 +0200
@@ -926,12 +926,18 @@
}
else {
while (<MOUNTS>) {
- if (m/^([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)/
+ if (
+ my ($resolved1, $resolved2, $resolved3, $resolved4)
+ = m/^([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)/
)
{
- my $resolved1 = $1;
+ # Linux >= 2.6.39 (or around) adds a slash at the end of
+ # an NFS mount source in /proc/mounts, we need to remove
+ # it.
+ $resolved1 =~ s{ / \z }{}xms;
+
{
- my $oldmsourceaddr = $1;
+ my $oldmsourceaddr = $resolved1;
$oldmsourceaddr =~ s/^([^:]+):(.+)$/$1/; # NFS
if ( defined($oldmsourceaddr)
&& !isipaddr($oldmsourceaddr) )
@@ -951,16 +957,16 @@
}
if ( $resolved1 eq $source && $source ne "none" ) {
- $oldmdest = $2;
+ $oldmdest = $resolved2;
}
- if ( $2 eq $dest ) {
- $oldmsource = $1;
+ if ( $resolved2 eq $dest ) {
+ $oldmsource = $resolved1;
$oldmresolvedsource = $resolved1;
}
- if ( $resolved1 eq $source && $2 eq $dest ) {
- $oldmfstype = $3;
- $oldmopts = $4;
+ if ( $resolved1 eq $source && $resolved2 eq $dest ) {
+ $oldmfstype = $resolved3;
+ $oldmopts = $resolved4;
$oldmopts = join( ',', sort split( ',', $oldmopts ) );
}
}
diff -r 62698bacef00 -r 76afd2e0da7b sbin/mk_pxelinuxcfg
--- a/sbin/mk_pxelinuxcfg Thu Mar 24 12:28:36 2011 +0100
+++ b/sbin/mk_pxelinuxcfg Wed Oct 26 13:57:31 2011 +0200
@@ -49,22 +49,12 @@
sub Get_kpkg_from_pxefilename ($$) {
my ( $pxefilename, $deploymode ) = @_ ;
- if ( $deploymode =~ /^ubuntu/ ) {
+ if ( $deploymode =~ m{ \A (?: debian | ubuntu ) }xms ) {
$pxefilename =~ /vmlinuz-(.+)$/;
return "linux-image-".$1;
}
else {
- if ( $pxefilename =~ /pxe/ ) {
- my ( $vm, $type, $pxe, $version, @append ) = split ( /-/, $pxefilename ) ;
- return "linux-image-".$version."-".$type."-".join ( "-", @append )."-grsec" ;
- }
- else {
- my ( $vm, $version, $type, $append_version ) = split ( /-/, $pxefilename ) ;
- $type = ( $type ) ? "-".$type : "";
- $append_version = ( $append_version ) ? "-".$append_version : "";
- my $kernel = "linux-image-".$version.$type.$append_version;
- return $kernel."-grsec" ;
- }
+ die qq{Unknown deploymode '$deploymode'};
}
}
More information about the pf-tools-commits
mailing list