summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-14 09:25:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-14 09:25:40 +0000
commite2cbffc6422fc59ee624c2c399e79109c21c7cc4 (patch)
tree8bc16a2c6a23da765f7bd7ca08b5ad5dc676b6c5 /perl-install/install2.pm
parent9266168309a593e84c47cc59edb2a6ccd49e4686 (diff)
downloaddrakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.gz
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.bz2
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.xz
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm12
1 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e658953dd..8e7390bca 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -58,7 +58,7 @@ my (%installSteps, @orderedInstallSteps);
configurePrinter => [ __("Configure printer"), 1, 0, '', "doInstallStep" ],
setRootPassword => [ __("Set root password"), 1, 1, '', "formatPartitions" ],
addUser => [ __("Add a user"), 1, 1, '', "doInstallStep" ],
-arch() =~ /alpha/ ? (
+arch() !~ /alpha/ ? (
createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "doInstallStep" ],
) : (),
setupBootloader => [ __("Install bootloader"), 1, 1, '', "doInstallStep" ],
@@ -372,7 +372,7 @@ sub doInstallStep {
$o->beforeInstallPackages;
$o->installPackages($o->{packages});
- $o->afterInstallPackages;
+ $o->afterInstallPackages;
}
#------------------------------------------------------------------------------
sub miscellaneous {
@@ -386,10 +386,16 @@ sub miscellaneous {
TYPE => $o->{installClass},
SECURITY => $o->{security},
});
+
+ setVarsInSh("$o->{prefix}/etc/sysconfig/usb", {
+ MOUSE => bool2yesno($o->{mouse}{device} eq "usbmouse"),
+ KEYBOARD => bool2yesno(int grep { /^keybdev\.c: Adding keyboard/ } detect_devices::syslog()),
+ });
+
install_any::fsck_option();
local $ENV{LILO_PASSWORD} = $o->{lilo}{password};
- run_program::rooted($o->{prefix}, "/etc/security/msec/init.sh", $o->{security});
+ run_program::rooted($o->{prefix}, "/usr/sbin/msec", $o->{security});
} 'doInstallStep';
}