summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorChmouel Boudjnah <chmouel@mandriva.org>2000-05-25 14:13:37 +0000
committerChmouel Boudjnah <chmouel@mandriva.org>2000-05-25 14:13:37 +0000
commit7338cf4a2972b3b0938816a3f7a517303c985e43 (patch)
tree82daa451903a15ca761e3f5a750b09f78579eebf /perl-install
parent817ddbb5043d6b326cc39aa25e0d06e9487ec0e8 (diff)
downloaddrakx-backup-do-not-use-7338cf4a2972b3b0938816a3f7a517303c985e43.tar
drakx-backup-do-not-use-7338cf4a2972b3b0938816a3f7a517303c985e43.tar.gz
drakx-backup-do-not-use-7338cf4a2972b3b0938816a3f7a517303c985e43.tar.bz2
drakx-backup-do-not-use-7338cf4a2972b3b0938816a3f7a517303c985e43.tar.xz
drakx-backup-do-not-use-7338cf4a2972b3b0938816a3f7a517303c985e43.zip
"Seethechangelog"
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog6
-rwxr-xr-xperl-install/standalone/drakboot3
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) {