summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_interactive.pm20
2 files changed, 19 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index ea3ffcbeb..27555e4fd 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -489,7 +489,7 @@ sub main {
class => sub { $o->{installClass} = $v },
fclass => sub { $o->{installClass} = $v; push @auto, 'selectInstallClass' },
desktop => sub { $o->{meta_class} = 'desktop' },
- firewall => sub { $o->{meta_class} = 'firewall' },
+ firewall => sub { $o->{meta_class} = 'firewall'; push @auto, 'selectInstallClass'},
lnx4win => sub { $o->{lnx4win} = 1 },
readonly => sub { $o->{partitioning}{readonly} = $v ne "0" },
display => sub { $o->{display} = $v },
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e74789c8c..d7a5fb728 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1109,15 +1109,31 @@ Do you really want to quit now?"), 0);
$o->exit unless $alldone;
- $o->ask_warn('',
-_("Congratulations, installation is complete.
+ if ($::firewall) {
+ $o->ask_warn('',
+ _("Congratulations, installation is complete.
Remove the boot media and press return to reboot.
+For further configuration, connect on https://$o->{netc}{HOSTNAME}:8443/ with your admin account
+
+****************************************
+
For information on fixes which are available for this release of Linux-Mandrake,
consult the Errata available from http://www.linux-mandrake.com/.
Information on configuring your system is available in the post
install chapter of the Official Linux-Mandrake User's Guide.")) if $alldone && !$::g_auto_install;
+ } else {
+ $o->ask_warn('',
+ _("Congratulations, installation is complete.
+Remove the boot media and press return to reboot.
+
+For information on fixes which are available for this release of Linux-Mandrake,
+consult the Errata available from http://www.linux-mandrake.com/.
+
+Information on configuring your system is available in the post
+install chapter of the Official Linux-Mandrake User's Guide.")) if $alldone && !$::g_auto_install;
+ }
}