diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-08-18 05:44:25 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-08-18 05:44:25 +0000 |
| commit | 6b69393d2b0c2911f486ca6c0046ccf6e1a3f238 (patch) | |
| tree | d0f131da5b1d5ae7f370b0cd3411242eee1a7990 /perl-install/install_any.pm | |
| parent | 94f257d030c1fd411ec48e438db18c657cd97e40 (diff) | |
| download | drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.tar drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.tar.gz drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.tar.bz2 drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.tar.xz drakx-6b69393d2b0c2911f486ca6c0046ccf6e1a3f238.zip | |
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 596f5191a..9655d1834 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -277,7 +277,7 @@ sub setPackages($) { push @{$o->{default_packages}}, "raidtools" if $o->{raid} && !is_empty_array_ref($o->{raid}{raid}); push @{$o->{default_packages}}, "reiserfs-utils" if grep { isReiserfs($_) } @{$o->{fstab}}; push @{$o->{default_packages}}, "cdrecord" if detect_devices::getIDEBurners(); - push @{$o->{default_packages}}, "alsa", "alsa-utils" if modules::get_alias("sound") =~ /^snd-card-/; + push @{$o->{default_packages}}, "alsa", "alsa-utils" if modules::get_alias("snd-slot-0") =~ /^snd-card-/; pkgs::getDeps($o->{prefix}, $o->{packages}); pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1); @@ -617,13 +617,15 @@ 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"; - + $part->{mntpoint} = $mnt; # try to find other mount points via fstab fs::get_mntpoints_from_fstab(\@parts, $d) if $mnt eq '/'; } - $_->{mntpoint} and fsedit::suggest_part($_, $hds) foreach @parts; + $_->{mntpoint} || fsedit::suggest_part($_, $hds) foreach @parts; + + $_->{mntpoint} and log::l("suggest_mount_points: $_->{device} -> $_->{mntpoint}") foreach @parts; } #- mainly for finding the root partitions for upgrade |