summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-19 14:38:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-19 14:38:08 +0000
commit60cb93a00f95bdce9fe9f8595b86feb9eddc5a4c (patch)
tree7b3c13ebb14e17d7af02b40c8b3dcf945ead4186
parent7b17d15c1b6aa73880c05e9dcd7789e86299f68a (diff)
downloaddrakx-60cb93a00f95bdce9fe9f8595b86feb9eddc5a4c.tar
drakx-60cb93a00f95bdce9fe9f8595b86feb9eddc5a4c.tar.gz
drakx-60cb93a00f95bdce9fe9f8595b86feb9eddc5a4c.tar.bz2
drakx-60cb93a00f95bdce9fe9f8595b86feb9eddc5a4c.tar.xz
drakx-60cb93a00f95bdce9fe9f8595b86feb9eddc5a4c.zip
no_comment
-rw-r--r--perl-install/pkgs.pm1
-rwxr-xr-xperl-install/standalone/drakboot11
2 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index e07bdbd14..19c60f0ed 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -943,6 +943,7 @@ sub install($$$;$$) {
$error_msg and die $error_msg;
} else {
#- child process will run each transaction.
+ $SIG{SEGV} = sub { print OUTPUT "die:crashed\n"; c::_exit(0) };
eval {
close INPUT;
select((select(OUTPUT), $| = 1)[0]);
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 6171c5a30..2bcef5da4 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -19,6 +19,17 @@ $::isStandalone = 1;
my $in = vnew interactive('su');
+my %l = (
+ _("Configure LILO/GRUB") => '',
+ _("Create a boot floppy") => '/usr/X11R6/bin/drakfloppy',
+ _("Format floppy") => '/usr/bin/gfloppy',
+);
+-x $l{$_} or delete $l{$_} foreach grep { $l{$_} } keys %l;
+
+my $cmd = $l{$in->ask_from_list(_("Choice"), _("What do you want to do?"), [ keys %l ])};
+exec $cmd if $cmd;
+
+
my $bootloader = lilo::read('', '/etc/lilo.conf');
local ($_) = `detectloader`;
$bootloader->{methods} = { lilo => 1, grub => !!/grub/i };