summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-14 18:47:39 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-14 18:47:39 +0000
commit8418efcc6c39e3c3de1297c9048f58342834247e (patch)
tree7bd6153acd271cee2551bad127e44ae914f258d1
parent97cbcfe22d1866ea66732cbe8284a9a6076b65c6 (diff)
downloaddrakx-backup-do-not-use-8418efcc6c39e3c3de1297c9048f58342834247e.tar
drakx-backup-do-not-use-8418efcc6c39e3c3de1297c9048f58342834247e.tar.gz
drakx-backup-do-not-use-8418efcc6c39e3c3de1297c9048f58342834247e.tar.bz2
drakx-backup-do-not-use-8418efcc6c39e3c3de1297c9048f58342834247e.tar.xz
drakx-backup-do-not-use-8418efcc6c39e3c3de1297c9048f58342834247e.zip
fix reading security level
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/drakboot4
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 96a63c506..799c2fecc 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o fix reading security level
+
Version 13.4 - 7 January 2009
- installation mount points: reset unknown partitions types to default
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index b8352f19c..6177fd00c 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);
}