diff options
| -rw-r--r-- | perl-install/ChangeLog | 6 | ||||
| -rwxr-xr-x | perl-install/standalone/drakboot | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 90bfa7245..f7f427140 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,8 @@ +2000-05-25 Chmouel Boudjnah <chmouel@mandrakesoft.com> + + * standalone/drakboot: Don't display Configure-/LILO/GRUB/ on + alpha|sparc. + 2000-05-25 François Pons <fpons@mandrakesoft.com> * silo.pm: added configure_entry to try creating an initrd for an image @@ -18,6 +23,7 @@ * partition_table_sun.pm: fixed a bug when reading partition table with unused partition in the middle of the table. +>>>>>>> 1.114 2000-05-23 François Pons <fpons@mandrakesoft.com> * common.pm: update arch to take into account sparc and sparc64. added diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index ee348b93f..fc047cf67 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -20,10 +20,13 @@ $::isStandalone = 1; my $in = vnew interactive('su'); 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) { |