summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-12 18:41:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-12 18:41:27 +0000
commit703daff08f924e303218385857b4f71fc85f2e07 (patch)
tree51cfb2edeab1eb0bd3cb20354ee99764e485bdc7 /perl-install
parent935280a5aeb4f41ab575b6f2a54f759bdab1f2bf (diff)
downloaddrakx-703daff08f924e303218385857b4f71fc85f2e07.tar
drakx-703daff08f924e303218385857b4f71fc85f2e07.tar.gz
drakx-703daff08f924e303218385857b4f71fc85f2e07.tar.bz2
drakx-703daff08f924e303218385857b4f71fc85f2e07.tar.xz
drakx-703daff08f924e303218385857b4f71fc85f2e07.zip
no "auto install floppy" on ppc
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/install_steps_interactive.pm5
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 123e620b6..8570f6e51 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -997,7 +997,7 @@ sub exitInstall {
output "$::prefix$report", install_any::report_bug($o->{prefix});
run_program::rooted($::prefix, 'gzip', $report);
};
- install_any::getAndSaveAutoInstallFloppies($o, 1);
+ install_any::getAndSaveAutoInstallFloppies($o, 1) if arch() !~ /^ppc/;
eval { output "$o->{prefix}/root/drakx/README", "This directory contains several installation-related files,
mostly log files (very useful if you ever report a bug!).
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 13b2a4acf..e3c4bbf87 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1356,7 +1356,8 @@ Do you really want to quit now?"), 0);
ok => N("Reboot"),
},
[
- { val => \ (my $_t1 = N("Generate auto install floppy")), clicked => sub {
+ if_(arch() !~ /^ppc/,
+ { val => \ (my $_t1 = N("Generate auto install floppy")), clicked => sub {
my $t = $o->ask_from_list_('',
N("The auto install can be fully automated if wanted,
in that case it will take over the hard drive!!
@@ -1365,7 +1366,7 @@ in that case it will take over the hard drive!!
You may prefer to replay the installation.
"), [ N_("Replay"), N_("Automated") ]);
$t and $o->generateAutoInstFloppy($t eq 'Replay');
- }, advanced => 1 },
+ }, advanced => 1 }),
{ val => \ (my $_t2 = N("Save packages selection")), clicked => sub { install_any::g_default_packages($o) }, advanced => 1 },
]
) if $alldone;