summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-01 21:10:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-01 21:10:35 +0000
commit863a0345a2f895d35046f35d97f473e825906687 (patch)
treee04cae4c0cfa6b0e481cae4d976ecb32c30e6dea /perl-install/install_any.pm
parent608738174ef563cd88f95f53683f73f316b8f552 (diff)
downloaddrakx-863a0345a2f895d35046f35d97f473e825906687.tar
drakx-863a0345a2f895d35046f35d97f473e825906687.tar.gz
drakx-863a0345a2f895d35046f35d97f473e825906687.tar.bz2
drakx-863a0345a2f895d35046f35d97f473e825906687.tar.xz
drakx-863a0345a2f895d35046f35d97f473e825906687.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 789dea2d4..48fc1a935 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -225,7 +225,7 @@ sub spawnShell {
exec {"/bin/sh"} "-/bin/sh" or log::l("exec of /bin/sh failed: $!");
}
-sub fsck_option() {
+sub fsck_option {
my ($o) = @_;
my $y = $o->{security} < 3 && $::beginner ? "-y " : "";
substInFile { s/^(\s*fsckoptions="?)(-y )?/$1$y/ } "$o->{prefix}/etc/rc.d/rc.sysinit";
@@ -628,7 +628,7 @@ sub suggest_mount_points {
my $d = $handle->{dir};
my ($mnt) = grep { -e "$d/$l{$_}" } keys %l;
$mnt ||= (stat("$d/.bashrc"))[4] ? '/root' : '/home/user' . ++$user if -e "$d/.bashrc";
- $mnt ||= (grep { -d $_ && (stat($_))[4] >= 500 && -e "$_/.bashrc" } glob_("$d")) && '/home';
+ $mnt ||= (grep { -d $_ && (stat($_))[4] >= 500 && -e "$_/.bashrc" } glob_("$d")) ? '/home' : '';
next if $uniq && fsedit::mntpoint2part($mnt, \@parts);
$part->{mntpoint} = $mnt;