author: Pascal Rigaux <pixel@mandriva.com> 2001-08-17 17:09:25 +0000
committer: Pascal Rigaux <pixel@mandriva.com> 2001-08-17 17:09:25 +0000
commit: fb99b425049ff55d76b863c9357d58d5925a3c3d (patch)
tree: 9d459608af63b873636c95e108db3b106102c93b /perl-install/bootlook.pm
parent: b68d5db11e89565538dc3323740ef0e665c85607 (* diskdrake_interactive created, diskdrake is now interactive aware * added some documentation about the structure used for partitioning * all_hds now contain the various hds, lvm, raid * cleanup the isLVM, isRAID and alike functions * field {type} in detect_devices is now {media_type} * detect_devices::floppies is now floppies_dev * removed old function prototypes
Diffstat (limited to 'perl-install/bootlook.pm')
-rw-r--r-- perl-install/bootlook.pm 10

1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index ce756e6b7..a9cac7b0f 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -331,15 +331,15 @@ sub lilo_choice
local ($_) = `detectloader`;
$bootloader->{methods} = { lilo => 1, grub => !!/grub/i };

- my ($hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
- my $fstab = [ fsedit::get_fstab(@$hds) ];
- fs::get_mntpoints_from_fstab($fstab);
+ my ($all_hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
+ my $fstab = [ fsedit::get_all_fstab($all_hds) ];
+ fs::get_all_mntpoints_from_fstab($all_hds);

$::expert=1;
ask:
local $::isEmbedded = 0;
- any::setupBootloader($in, $bootloader, $hds, $fstab, $ENV{SECURE_LEVEL}) or return;
- eval { bootloader::install('', $bootloader, $fstab, $hds) };
+ any::setupBootloader($in, $bootloader, $all_hds->{hds}, $fstab, $ENV{SECURE_LEVEL}) or return;
+ eval { bootloader::install('', $bootloader, $fstab, $all_hds->{hds}) };
if ($@) {
$in->ask_warn('',
[ _("Installation of LILO failed. The following error occured:"),

generated by cgit v1.2.1 (git 2.21.0) at 2024-06-14 01:12:46 +0000
class="hl kwd">init_progression(char *msg, int size) { previous = 0; total_size = size; open_bootsplash(); update_progression_only(0); init_progression_raw(msg, size); } void update_progression(int current_size) { update_progression_only(current_size); update_progression_raw(current_size); } void end_progression(void) { end_progression_raw(); } -rw-r--r-- perl-install/bootlook.pm 10 diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index ce756e6b7..a9cac7b0f 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -331,15 +331,15 @@ sub lilo_choice
local ($_) = `detectloader`;
$bootloader->{methods} = { lilo => 1, grub => !!/grub/i };

- my ($hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
- my $fstab = [ fsedit::get_fstab(@$hds) ];
- fs::get_mntpoints_from_fstab($fstab);
+ my ($all_hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
+ my $fstab = [ fsedit::get_all_fstab($all_hds) ];
+ fs::get_all_mntpoints_from_fstab($all_hds);

$::expert=1;
ask:
local $::isEmbedded = 0;
- any::setupBootloader($in, $bootloader, $hds, $fstab, $ENV{SECURE_LEVEL}) or return;
- eval { bootloader::install('', $bootloader, $fstab, $hds) };
+ any::setupBootloader($in, $bootloader, $all_hds->{hds}, $fstab, $ENV{SECURE_LEVEL}) or return;
+ eval { bootloader::install('', $bootloader, $fstab, $all_hds->{hds}) };
if ($@) {
$in->ask_warn('',
[ _("Installation of LILO failed. The following error occured:"),
-rw-r--r-- perl-install/bootlook.pm 10
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index ce756e6b7..a9cac7b0f 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -331,15 +331,15 @@ sub lilo_choice
local ($_) = `detectloader`;
$bootloader->{methods} = { lilo => 1, grub => !!/grub/i };

- my ($hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
- my $fstab = [ fsedit::get_fstab(@$hds) ];
- fs::get_mntpoints_from_fstab($fstab);
+ my ($all_hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
+ my $fstab = [ fsedit::get_all_fstab($all_hds) ];
+ fs::get_all_mntpoints_from_fstab($all_hds);

$::expert=1;
ask:
local $::isEmbedded = 0;
- any::setupBootloader($in, $bootloader, $hds, $fstab, $ENV{SECURE_LEVEL}) or return;
- eval { bootloader::install('', $bootloader, $fstab, $hds) };
+ any::setupBootloader($in, $bootloader, $all_hds->{hds}, $fstab, $ENV{SECURE_LEVEL}) or return;
+ eval { bootloader::install('', $bootloader, $fstab, $all_hds->{hds}) };
if ($@) {
$in->ask_warn('',
[ _("Installation of LILO failed. The following error occured:"),
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index ce756e6b7..a9cac7b0f 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -331,15 +331,15 @@ sub lilo_choice
     local ($_) = `detectloader`;
     $bootloader->{methods} = { lilo => 1, grub => !!/grub/i };
     
-    my ($hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
-    my $fstab = [ fsedit::get_fstab(@$hds) ];
-    fs::get_mntpoints_from_fstab($fstab);
+    my ($all_hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
+    my $fstab = [ fsedit::get_all_fstab($all_hds) ];
+    fs::get_all_mntpoints_from_fstab($all_hds);
  
     $::expert=1;
   ask:
     local $::isEmbedded = 0;
-    any::setupBootloader($in, $bootloader, $hds, $fstab, $ENV{SECURE_LEVEL}) or return;
-    eval { bootloader::install('', $bootloader, $fstab, $hds) };  
+    any::setupBootloader($in, $bootloader, $all_hds->{hds}, $fstab, $ENV{SECURE_LEVEL}) or return;
+    eval { bootloader::install('', $bootloader, $fstab, $all_hds->{hds}) };  
     if ($@) {
 	$in->ask_warn('', 
 		      [ _("Installation of LILO failed. The following error occured:"),