summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-27 22:03:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-27 22:03:43 +0000
commitbfaaea5cde6cc2b2daf37d2e5d3988ad77ce7334 (patch)
tree658be580f0c9c26aed53a8b18efe9f9eea36d65c
parent30efecf1b9172131e2d2019eca0f72dc63f44c43 (diff)
downloaddrakx-bfaaea5cde6cc2b2daf37d2e5d3988ad77ce7334.tar
drakx-bfaaea5cde6cc2b2daf37d2e5d3988ad77ce7334.tar.gz
drakx-bfaaea5cde6cc2b2daf37d2e5d3988ad77ce7334.tar.bz2
drakx-bfaaea5cde6cc2b2daf37d2e5d3988ad77ce7334.tar.xz
drakx-bfaaea5cde6cc2b2daf37d2e5d3988ad77ce7334.zip
use the new fsedit::get_hds
-rw-r--r--perl-install/Xconfig/various.pm2
-rwxr-xr-xperl-install/standalone/drakboot2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
index c0f7079f6..646edf8be 100644
--- a/perl-install/Xconfig/various.pm
+++ b/perl-install/Xconfig/various.pm
@@ -118,7 +118,7 @@ sub configure_FB_TVOUT {
require detect_devices;
my ($bootloader, $all_hds) =
$::isInstall ? ($::o->{bootloader}, $::o->{all_hds}) :
- (bootloader::read(), fsedit::hds([ detect_devices::hds() ], {}));
+ (bootloader::read(), fsedit::get_hds());
if (my $tvout = bootloader::duplicate_kernel_entry($bootloader, 'TVout')) {
$tvout->{append} .= " XFree=tvout";
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 9c3449d1d..ade6207de 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -40,7 +40,7 @@ sub lilo_choice
local ($_) = `detectloader`;
$bootloader->{methods} = { lilo => 1, grub => !!/grub/i, if_(arch() =~ /ppc/, yaboot => 1) };
- my ($all_hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
+ my ($all_hds) = fsedit::get_hds();
my $fstab = [ fsedit::get_all_fstab($all_hds) ];
fs::merge_info_from_fstab($fstab);