summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-14 10:30:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-14 10:30:39 +0000
commit05a4b46180cb776d2940a562d34eeb85de9c19ee (patch)
tree133e3f7c78d6dc65152ae3df70b8fe39ef8dbfe3
parentdc2e5d25c2ef9793f58ac22188ab5ab9fca25c11 (diff)
downloaddrakx-backup-do-not-use-05a4b46180cb776d2940a562d34eeb85de9c19ee.tar
drakx-backup-do-not-use-05a4b46180cb776d2940a562d34eeb85de9c19ee.tar.gz
drakx-backup-do-not-use-05a4b46180cb776d2940a562d34eeb85de9c19ee.tar.bz2
drakx-backup-do-not-use-05a4b46180cb776d2940a562d34eeb85de9c19ee.tar.xz
drakx-backup-do-not-use-05a4b46180cb776d2940a562d34eeb85de9c19ee.zip
o fix typo breaking reading fstab with UUID= entries
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/wild_device.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 382fadbbd..c5d84e358 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o fix typo breaking reading fstab with UUID= entries
+
Version 10.4.195 - 14 September 2007, by Thierry Vignaud
- distinct exceptions from segfaults, thus restoring catching SIGSEGV
diff --git a/perl-install/fs/wild_device.pm b/perl-install/fs/wild_device.pm
index 206428402..5d6ea5e86 100644
--- a/perl-install/fs/wild_device.pm
+++ b/perl-install/fs/wild_device.pm
@@ -36,7 +36,7 @@ sub to_subpart {
if (my ($kind, $val) = analyze($dev)) {
if ($kind eq 'label') {
$part->{device_LABEL} = $val;
- } elsif ($kind eq 'label') {
+ } elsif ($kind eq 'uuid') {
$part->{device_UUID} = $val;
} elsif ($kind eq 'dev') {
my %part = (faked_device => 0);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 63da6b456..edf08198b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix typo breaking reading fstab with UUID= entries
+
Version 10.4.195 - 14 September 2007, by Olivier "blino" Blin
- fix loading of tifm_sd module (#18237)