summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-09-23 09:12:39 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-09-23 09:12:39 +0000
commit971cd91b874681bbed3b4c49f6483a8ee469e265 (patch)
tree0f77aab8424935b500bb591b213c2a1bdccdf3af /perl-install
parent963678adb996f03b39b48829f4a986b31ea797d6 (diff)
downloaddrakx-971cd91b874681bbed3b4c49f6483a8ee469e265.tar
drakx-971cd91b874681bbed3b4c49f6483a8ee469e265.tar.gz
drakx-971cd91b874681bbed3b4c49f6483a8ee469e265.tar.bz2
drakx-971cd91b874681bbed3b4c49f6483a8ee469e265.tar.xz
drakx-971cd91b874681bbed3b4c49f6483a8ee469e265.zip
Don't detect disks if we are not in bootloader or splash mode
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/drakboot12
2 files changed, 10 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index dad05c3f9..be2e8c726 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o don't detect disks if we are not in bootloader or splash mode
+
Version 12.53 - 22 September 2009
- drakxtools_http:
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index a7b253017..2b364f0dd 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -38,16 +38,18 @@ use log;
my $in = 'interactive'->vnew('su');
-my $all_hds = fsedit::get_hds();
-fs::get_raw_hds('', $all_hds);
-fs::get_info_from_fstab($all_hds);
-my $fstab = [ fs::get::fstab($all_hds) ];
+my $all_hds;
+my $fstab;
+my $bootloader;
my $cmdline = cat_('/proc/cmdline');
-my $bootloader;
my $is_bootloader_mode = !$in->isa('interactive::gtk') || any { /^--boot$/ } @ARGV;
if ($is_bootloader_mode || any { /^--splash$/ } @ARGV) {
+ $all_hds = fsedit::get_hds();
+ fs::get_raw_hds('', $all_hds);
+ fs::get_info_from_fstab($all_hds);
+ $fstab = [ fs::get::fstab($all_hds) ];
$bootloader = bootloader::read($all_hds);
if (!$bootloader) {
$in->ask_okcancel('', N("No bootloader found, creating a new configuration"), 0) or $in->exit;