summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakboot
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-22 03:18:11 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-01-02 14:58:12 +0100
commit4d29e3c76f18c129167e597425037f41d8d5ffd8 (patch)
treec781f8f2271bd47cf2fd8ac837af7077a0d16f88 /perl-install/standalone/drakboot
parent360cf28714c9ffdf624ddee0055cc7fd39a0247f (diff)
downloaddrakx-4d29e3c76f18c129167e597425037f41d8d5ffd8.tar
drakx-4d29e3c76f18c129167e597425037f41d8d5ffd8.tar.gz
drakx-4d29e3c76f18c129167e597425037f41d8d5ffd8.tar.bz2
drakx-4d29e3c76f18c129167e597425037f41d8d5ffd8.tar.xz
drakx-4d29e3c76f18c129167e597425037f41d8d5ffd8.zip
simplify after previous commit
Diffstat (limited to 'perl-install/standalone/drakboot')
-rwxr-xr-xperl-install/standalone/drakboot7
1 files changed, 0 insertions, 7 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 68e67d396..1bb85fa1b 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -35,11 +35,7 @@ my $in = 'interactive'->vnew('su');
my $all_hds;
my $fstab;
my $bootloader;
-my $cmdline = cat_('/proc/cmdline');
-my $is_bootloader_mode = !$in->isa('interactive::gtk') || any { /^--boot$/ } @ARGV;
-
-if ($is_bootloader_mode) {
$all_hds = fsedit::get_hds();
fs::get_raw_hds('', $all_hds);
fs::get_info_from_fstab($all_hds);
@@ -49,13 +45,10 @@ if ($is_bootloader_mode) {
$in->ask_okcancel('', N("No bootloader found, creating a new configuration"), 0) or $in->exit;
any::setupBootloaderBeforeStandalone($in->do_pkgs, $bootloader ||= {}, $all_hds, $fstab);
}
-}
-if ($is_bootloader_mode) {
$::isWizard = 1;
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);
-}