summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-19 15:28:16 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-19 15:28:16 +0000
commit07f232002fd6cb3ac02194079cd402e1d75e14fa (patch)
tree29204423a0ffb13d963e7c5aef54f26dde43949c
parent88465a943b306b7f1c9a45dd9967316d85cd1ccd (diff)
downloaddrakx-backup-do-not-use-07f232002fd6cb3ac02194079cd402e1d75e14fa.tar
drakx-backup-do-not-use-07f232002fd6cb3ac02194079cd402e1d75e14fa.tar.gz
drakx-backup-do-not-use-07f232002fd6cb3ac02194079cd402e1d75e14fa.tar.bz2
drakx-backup-do-not-use-07f232002fd6cb3ac02194079cd402e1d75e14fa.tar.xz
drakx-backup-do-not-use-07f232002fd6cb3ac02194079cd402e1d75e14fa.zip
fix reading security level
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/drakboot4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1549ebea9..ecfd5e515 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- display_help:
o hide Gtk+ "close" button when displaying first time wizard that
now has a HTML "close" button again
+- drakboot:
+ o fix reading security level
Version 12.77.3 - 14 January 2010
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 3a47d8b1e..131c56355 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -59,7 +59,9 @@ if ($is_bootloader_mode || any { /^--splash$/ } @ARGV) {
if ($is_bootloader_mode) {
$::isWizard = 1;
- eval { any::setupBootloaderUntilInstalled($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) };
+ require security::level;
+ my $level = security::level::from_string(security::level::get());
+ eval { any::setupBootloaderUntilInstalled($in, $bootloader, $all_hds, $fstab, $level) };
die if $@ && $@ !~ /^wizcancel/;
$in->exit(0);
}