[Fai-commit] r5284 - branches/lenny/debian branches/lenny/lib/setup-storage tags/3.2.17/debian tags/3.2.17/lib/setup-storage tags/3.2.17~lenny1/debian tags/3.2.17~lenny1/lib/setup-storage trunk/debian trunk/lib/setup-storage
holger at alioth.debian.org
holger at alioth.debian.org
Wed Feb 25 12:31:01 UTC 2009
Author: holger
Date: 2009-02-25 12:31:00 +0000 (Wed, 25 Feb 2009)
New Revision: 5284
Modified:
branches/lenny/debian/changelog
branches/lenny/lib/setup-storage/Parser.pm
tags/3.2.17/debian/changelog
tags/3.2.17/lib/setup-storage/Parser.pm
tags/3.2.17~lenny1/debian/changelog
tags/3.2.17~lenny1/lib/setup-storage/Parser.pm
trunk/debian/changelog
trunk/lib/setup-storage/Parser.pm
Log:
changelog entry:
+ * Fix regex in setup-storage/Parser.pm to not force a space onto VG / LV
+ names, which is illegal for such ids, thanks Frederic Blanc for the patch.
+ (Closes: #516849)
Michael (T.), do you agree with this wording? (And please re-check the actual diff I commited :) It seems fine to me. :)
This has been commited against trunk, branches/lenny, tags/3.2.17 and tags/3.2.17~lenny1 - the latter two will be uploaded to sid and stable as soon as Thomas gives his ACK.
Modified: branches/lenny/debian/changelog
===================================================================
--- branches/lenny/debian/changelog 2009-02-22 15:41:49 UTC (rev 5283)
+++ branches/lenny/debian/changelog 2009-02-25 12:31:00 UTC (rev 5284)
@@ -5,12 +5,15 @@
* Added myself to uploaders.
* Fix typo in fai-do-scripts which prevented perl scripts to be executed,
thanks to Andrew Ruthven for reporting this. (Closes: #504662)
+ * Fix regex in setup-storage/Parser.pm to not force a space onto VG / LV
+ names, which is illegal for such ids, thanks Frederic Blanc for the patch.
+ (Closes: #516849)
* fai-mirror: honor $debug and $qflag environment variables, thanks to
Michael Tautschnig. (Closes: #494431)
* device2grub: Add /dev/i2o/hdX to the list of recognized devices. Thanks
to Jürgen Kahnert for the patch. (Closes: #515101)
- -- Holger Levsen <holger at debian.org> Sun, 22 Feb 2009 16:26:19 +0100
+ -- Holger Levsen <holger at debian.org> Wed, 25 Feb 2009 12:26:19 +0100
fai (3.2.16) unstable; urgency=high
Modified: branches/lenny/lib/setup-storage/Parser.pm
===================================================================
--- branches/lenny/lib/setup-storage/Parser.pm 2009-02-22 15:41:49 UTC (rev 5283)
+++ branches/lenny/lib/setup-storage/Parser.pm 2009-02-25 12:31:00 UTC (rev 5284)
@@ -375,7 +375,7 @@
{
# set the preserve flag for all ids in all cases
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{preserve} = 1
}
@@ -385,7 +385,7 @@
# set the preserve flag for all ids if $FAI::reinstall is set
if ($FAI::reinstall) {
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{preserve} = 1
}
@@ -395,7 +395,7 @@
{
# set the resize flag for all ids
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{resize} = 1
}
Modified: tags/3.2.17/debian/changelog
===================================================================
--- tags/3.2.17/debian/changelog 2009-02-22 15:41:49 UTC (rev 5283)
+++ tags/3.2.17/debian/changelog 2009-02-25 12:31:00 UTC (rev 5284)
@@ -5,12 +5,15 @@
* Added myself to uploaders.
* Fix typo in fai-do-scripts which prevented perl scripts to be executed,
thanks to Andrew Ruthven for reporting this. (Closes: #504662)
+ * Fix regex in setup-storage/Parser.pm to not force a space onto VG / LV
+ names, which is illegal for such ids, thanks Frederic Blanc for the patch.
+ (Closes: #516849)
* fai-mirror: honor $debug and $qflag environment variables, thanks to
Michael Tautschnig. (Closes: #494431)
* device2grub: Add /dev/i2o/hdX to the list of recognized devices. Thanks
to Jürgen Kahnert for the patch. (Closes: #515101)
- -- Holger Levsen <holger at debian.org> Sun, 22 Feb 2009 16:26:19 +0100
+ -- Holger Levsen <holger at debian.org> Wed, 25 Feb 2009 12:26:19 +0100
fai (3.2.16) unstable; urgency=high
Modified: tags/3.2.17/lib/setup-storage/Parser.pm
===================================================================
--- tags/3.2.17/lib/setup-storage/Parser.pm 2009-02-22 15:41:49 UTC (rev 5283)
+++ tags/3.2.17/lib/setup-storage/Parser.pm 2009-02-25 12:31:00 UTC (rev 5284)
@@ -375,7 +375,7 @@
{
# set the preserve flag for all ids in all cases
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{preserve} = 1
}
@@ -385,7 +385,7 @@
# set the preserve flag for all ids if $FAI::reinstall is set
if ($FAI::reinstall) {
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{preserve} = 1
}
@@ -395,7 +395,7 @@
{
# set the resize flag for all ids
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{resize} = 1
}
Modified: tags/3.2.17~lenny1/debian/changelog
===================================================================
--- tags/3.2.17~lenny1/debian/changelog 2009-02-22 15:41:49 UTC (rev 5283)
+++ tags/3.2.17~lenny1/debian/changelog 2009-02-25 12:31:00 UTC (rev 5284)
@@ -5,12 +5,15 @@
* Added myself to uploaders.
* Fix typo in fai-do-scripts which prevented perl scripts to be executed,
thanks to Andrew Ruthven for reporting this. (Closes: #504662)
+ * Fix regex in setup-storage/Parser.pm to not force a space onto VG / LV
+ names, which is illegal for such ids, thanks Frederic Blanc for the patch.
+ (Closes: #516849)
* fai-mirror: honor $debug and $qflag environment variables, thanks to
Michael Tautschnig. (Closes: #494431)
* device2grub: Add /dev/i2o/hdX to the list of recognized devices. Thanks
to Jürgen Kahnert for the patch. (Closes: #515101)
- -- Holger Levsen <holger at debian.org> Sun, 22 Feb 2009 16:26:19 +0100
+ -- Holger Levsen <holger at debian.org> Wed, 25 Feb 2009 12:26:19 +0100
fai (3.2.16) unstable; urgency=high
Modified: tags/3.2.17~lenny1/lib/setup-storage/Parser.pm
===================================================================
--- tags/3.2.17~lenny1/lib/setup-storage/Parser.pm 2009-02-22 15:41:49 UTC (rev 5283)
+++ tags/3.2.17~lenny1/lib/setup-storage/Parser.pm 2009-02-25 12:31:00 UTC (rev 5284)
@@ -375,7 +375,7 @@
{
# set the preserve flag for all ids in all cases
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{preserve} = 1
}
@@ -385,7 +385,7 @@
# set the preserve flag for all ids if $FAI::reinstall is set
if ($FAI::reinstall) {
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{preserve} = 1
}
@@ -395,7 +395,7 @@
{
# set the resize flag for all ids
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{resize} = 1
}
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-02-22 15:41:49 UTC (rev 5283)
+++ trunk/debian/changelog 2009-02-25 12:31:00 UTC (rev 5284)
@@ -63,12 +63,15 @@
* Added myself to uploaders.
* Fix typo in fai-do-scripts which prevented perl scripts to be executed,
thanks to Andrew Ruthven for reporting this. (Closes: #504662)
+ * Fix regex in setup-storage/Parser.pm to not force a space onto VG / LV
+ names, which is illegal for such ids, thanks Frederic Blanc for the patch.
+ (Closes: #516849)
* fai-mirror: honor $debug and $qflag environment variables, thanks to
Michael Tautschnig. (Closes: #494431)
* device2grub: Add /dev/i2o/hdX to the list of recognized devices. Thanks
to Jürgen Kahnert for the patch. (Closes: #515101)
- -- Holger Levsen <holger at debian.org> Sun, 22 Feb 2009 16:26:19 +0100
+ -- Holger Levsen <holger at debian.org> Wed, 25 Feb 2009 12:26:19 +0100
fai (3.2.16) unstable; urgency=high
Modified: trunk/lib/setup-storage/Parser.pm
===================================================================
--- trunk/lib/setup-storage/Parser.pm 2009-02-22 15:41:49 UTC (rev 5283)
+++ trunk/lib/setup-storage/Parser.pm 2009-02-25 12:31:00 UTC (rev 5284)
@@ -380,7 +380,7 @@
{
# set the preserve flag for all ids in all cases
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{preserve} = 1
}
@@ -390,7 +390,7 @@
# set the preserve flag for all ids if $FAI::reinstall is set
if ($FAI::reinstall) {
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{preserve} = 1
}
@@ -400,7 +400,7 @@
{
# set the resize flag for all ids
foreach (split (",", $1)) {
- (m{^([^/,\s\-]+)-([^/,\s\-]+)\s+}) or
+ (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or
die &FAI::internal_error("VG re-parse failed");
$FAI::configs{"VG_$1"}{volumes}{$2}{size}{resize} = 1
}
More information about the Fai-commit
mailing list