From c367a7b536cbc28a666370a8935718980bdc5ee3 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 2 May 2000 14:52:41 +0000 Subject: no_comment --- perl-install/standalone/drakboot | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'perl-install/standalone/drakboot') diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 8bff3e2eb..ee348b93f 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -21,10 +21,16 @@ my $in = vnew interactive('su'); my %l = ( _("Configure LILO/GRUB") => '', - _("Create a boot floppy") => '/usr/X11R6/bin/drakfloppy', - _("Format floppy") => '/usr/bin/gfloppy', + _("Create a boot floppy") => ['/usr/X11R6/bin/drakfloppy'], + _("Format floppy") => [ '/usr/bin/kfloppy', '/usr/bin/gfloppy' ], ); --x $l{$_} or delete $l{$_} foreach grep { $l{$_} } keys %l; +while (my ($k, $v) = each %l) { + $v or next; + foreach (@$v) { + -x $_ and $l{$k} = $_, last; + } + -x $l{$k} or delete $l{$_}; +} if ($ENV{DISPLAY} && c::Xtest($ENV{DISPLAY})) { my $cmd = $l{$in->ask_from_list(_("Choice"), _("What do you want to do?"), [ keys %l ])}; -- cgit v1.2.1