diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-05 22:29:28 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-05 22:29:28 +0000 |
| commit | c92dee798c9145de1164ef3e534b80aadf84db27 (patch) | |
| tree | ef5891dc6bc2993e07783992b8d50cd025277e22 | |
| parent | 035c70d7c10926a88aa0f24e74a04aae2775b069 (diff) | |
| download | drakx-backup-do-not-use-c92dee798c9145de1164ef3e534b80aadf84db27.tar drakx-backup-do-not-use-c92dee798c9145de1164ef3e534b80aadf84db27.tar.gz drakx-backup-do-not-use-c92dee798c9145de1164ef3e534b80aadf84db27.tar.bz2 drakx-backup-do-not-use-c92dee798c9145de1164ef3e534b80aadf84db27.tar.xz drakx-backup-do-not-use-c92dee798c9145de1164ef3e534b80aadf84db27.zip | |
- fix getting result of fsedit::hds
- cleanup
| -rwxr-xr-x | perl-install/standalone/drakboot | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index ca0db951c..4aee3c2cd 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -24,34 +24,12 @@ my $in = interactive->vnew('su'); require 'bootlook.pm' if ref($in) =~ /gtk/; -if (!$::isEmbedded) { - my %l = ( - arch() !~ /sparc|alpha/ ? ( - _("Configure LILO/GRUB") => '', - _("Create a boot floppy") => ['/usr/X11R6/bin/drakfloppy'], - ) : (), - _("Format floppy") => [ '/usr/bin/kfloppy', '/usr/bin/gfloppy' ], - ); - - while (my ($k, $v) = each %l) { - $v or next; - foreach (@$v) { - -x $_ and $l{$k} = $_, last; - } - -x $l{$k} or delete $l{$k}; - } - - if ($ENV{DISPLAY} && c::Xtest($ENV{DISPLAY})) { - my $cmd = $l{$in->ask_from_list(_("Choice"), _("What do you want to do?"), [ keys %l ])}; - exec $cmd if $cmd; - } -} my $bootloader = bootloader::read('', '/etc/lilo.conf'); local ($_) = `detectloader`; $bootloader->{methods} = { lilo => 1, grub => !!/grub/i }; -my $hds = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 }; +my ($hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 }; my $fstab = [ fsedit::get_fstab(@$hds) ]; fs::get_mntpoints_from_fstab($fstab); |