summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-21 23:04:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-21 23:04:52 +0000
commitb99d9f882ae0be783ab990a304dcb3f50cbf9685 (patch)
treeda926de23d916f4fb950da5594b9e2c04e352be6
parentbb14a5d13f88ced2f926f764f62c603bf22e547c (diff)
downloaddrakx-b99d9f882ae0be783ab990a304dcb3f50cbf9685.tar
drakx-b99d9f882ae0be783ab990a304dcb3f50cbf9685.tar.gz
drakx-b99d9f882ae0be783ab990a304dcb3f50cbf9685.tar.bz2
drakx-b99d9f882ae0be783ab990a304dcb3f50cbf9685.tar.xz
drakx-b99d9f882ae0be783ab990a304dcb3f50cbf9685.zip
can't call any::config_libsafe so early during install, move it where msec is called
-rw-r--r--perl-install/install2.pm1
-rw-r--r--perl-install/install_steps_interactive.pm3
2 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e28a570f1..c7c4af97e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -306,6 +306,7 @@ sub setupBootloader {
local $ENV{DRAKX_PASSWORD} = $o->{bootloader}{password};
local $ENV{DURING_INSTALL} = 1;
run_program::rooted($o->{prefix}, "/usr/sbin/msec", "-o", "run_commands=0", "-o", "log=stderr", $o->{security});
+ any::config_libsafe($o->{prefix}, $o->{libsafe});
}
#------------------------------------------------------------------------------
sub configureX {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f4f68f592..da7d576cd 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1238,9 +1238,6 @@ sub miscellaneous {
my ($o, $clicked) = @_;
any::choose_security_level($o, \$o->{security}, \$o->{libsafe}) or return;
-
- any::config_libsafe($o->{prefix}, $o->{libsafe});
-
install_steps::miscellaneous($o);
}