summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-01 15:47:23 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-01 15:47:23 +0000
commit4a1b8734460c8a675f5c3622ae6c03a02e9e140e (patch)
tree30112efb2ec33706461de4100d493dd3b8a202a0
parent3d74c4cbe79ceafe83842205e3d64fa3dfdf21d8 (diff)
downloaddrakx-4a1b8734460c8a675f5c3622ae6c03a02e9e140e.tar
drakx-4a1b8734460c8a675f5c3622ae6c03a02e9e140e.tar.gz
drakx-4a1b8734460c8a675f5c3622ae6c03a02e9e140e.tar.bz2
drakx-4a1b8734460c8a675f5c3622ae6c03a02e9e140e.tar.xz
drakx-4a1b8734460c8a675f5c3622ae6c03a02e9e140e.zip
(exitInstall) remove "Generate auto install floppy" & "Save packages
selection" options at end of installation
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm14
2 files changed, 2 insertions, 14 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0d1b080b8..acf79ab44 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,8 @@
and install updates. This replaces the previous "Install Updates" step.
- fix alignment of check buttons
- further improvements to the "bootloader", "partitionning" steps
+- remove "Generate auto install floppy" & "Save packages selection"
+ options at end of installation
Version 11.29 - 29 August 2008
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index f75088eed..231c3960a 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -1116,20 +1116,6 @@ Do you really want to quit now?"), 0);
interactive_help_id => 'exitInstall',
ok => $::local_install ? N("Quit") : N("Reboot"),
},
- [
- if_(arch() !~ /^ppc/,
- { val => \ (my $_t1 = N("Generate auto install floppy")), clicked => sub {
- my $t = $o->ask_from_list_(N("Generate auto install floppy"),
-N("The auto install can be fully automated if wanted,
-in that case it will take over the hard drive!!
-(this is meant for installing on another box).
-
-You may prefer to replay the installation.
-"), [ N_("Replay"), N_("Automated") ]);
- $t and $o->generateAutoInstFloppy($t eq 'Replay');
- }, advanced => 1 }),
- { val => \ (my $_t2 = N("Save packages selection")), clicked => sub { install::any::g_default_packages($o) }, advanced => 1 },
- ]
) if $alldone;
}