diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2003-09-08 11:50:36 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2003-09-08 11:50:36 +0000 |
commit | 56aa33e8cf2d62b12f4c56537d13905e6cafca72 (patch) | |
tree | e09c378ce6fde2418d64b4ce857efdcf93921921 /perl-install | |
parent | 3fbf212dd74829c7ca32ec2e4edcffd1aa6e6467 (diff) | |
download | drakx-backup-do-not-use-56aa33e8cf2d62b12f4c56537d13905e6cafca72.tar drakx-backup-do-not-use-56aa33e8cf2d62b12f4c56537d13905e6cafca72.tar.gz drakx-backup-do-not-use-56aa33e8cf2d62b12f4c56537d13905e6cafca72.tar.bz2 drakx-backup-do-not-use-56aa33e8cf2d62b12f4c56537d13905e6cafca72.tar.xz drakx-backup-do-not-use-56aa33e8cf2d62b12f4c56537d13905e6cafca72.zip |
fix check_mntpoint to get back error "There is already a partition with mount point %s\n"
Diffstat (limited to 'perl-install')
-rw-r--r-- | perl-install/fsedit.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index e583645dc..fbde3609b 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -517,15 +517,15 @@ sub package_needed_for_partition_type { $l{type2fs($part)}; } -#- do this before modifying $part->{mntpoint} -#- $part->{mntpoint} should not be used here, use $mntpoint instead +#- you can do this before modifying $part->{mntpoint} +#- so $part->{mntpoint} should not be used here, use $mntpoint instead sub check_mntpoint { my ($mntpoint, $hd, $part, $all_hds) = @_; $mntpoint eq '' || isSwap($part) || isNonMountable($part) and return; $mntpoint =~ m|^/| or die \N("Mount points must begin with a leading /"); $mntpoint =~ m|[\x7f-\xff]| and cdie \N("Mount points should contain only alphanumerical characters"); - $mntpoint ne $part->{mntpoint} && has_mntpoint($mntpoint, $all_hds) and die \N("There is already a partition with mount point %s\n", $mntpoint); + has_mntpoint($mntpoint, $all_hds) and die \N("There is already a partition with mount point %s\n", $mntpoint); cdie \N("You've selected a software RAID partition as root (/). No bootloader is able to handle this without a /boot partition. |