summaryrefslogtreecommitdiffstats
path: root/perl-install/fsedit.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-01 12:17:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-01 12:17:45 +0000
commitc12e1ed0e54193a0b287a14544e65bd6d81702a3 (patch)
tree2ac0578db8bc24017fbf4ecb69cdd61eea278400 /perl-install/fsedit.pm
parent8d98b670beb5e850987b4c3aa108bdc71a3d7189 (diff)
downloaddrakx-c12e1ed0e54193a0b287a14544e65bd6d81702a3.tar
drakx-c12e1ed0e54193a0b287a14544e65bd6d81702a3.tar.gz
drakx-c12e1ed0e54193a0b287a14544e65bd6d81702a3.tar.bz2
drakx-c12e1ed0e54193a0b287a14544e65bd6d81702a3.tar.xz
drakx-c12e1ed0e54193a0b287a14544e65bd6d81702a3.zip
fix drakupdate_fstab adding twice an entry in fstab, one with the old name, one with the devfs name
Diffstat (limited to 'perl-install/fsedit.pm')
-rw-r--r--perl-install/fsedit.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 87c50de6d..9f6874ce9 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -320,7 +320,8 @@ sub is_same_hd {
my ($s2) = $hd2->{device} =~ m|https?://(.+?)/*$|;
$s1 eq $s2;
} else {
- $hd1->{device} eq $hd2->{device};
+ $hd1->{devfs_device} && $hd2->{devfs_device} && $hd1->{devfs_device} eq $hd2->{devfs_device}
+ || $hd1->{device} eq $hd2->{device};
}
}