1 files changed, 27 insertions, 14 deletions

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 896d60641..3de853a65 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -87,6 +87,10 @@ sub acceptLicense {
 		   },
 		   [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ]))
       or do {
+	  if ($::globetrotter) {
+	      system("killall XFree86");
+	      exec("/sbin/reboot");
+	  };
 	  install_any::ejectCdrom();
 	  $o->exit;
       };
@@ -119,7 +123,7 @@ sub selectKeyboard {
 			{ val => \$ext_keyboard, type => 'list', format => $format,
 			  list => [ difference2([ keyboard::KEYBOARDs() ], \@best) ], advanced => @best > 1 }
 		      ]);
-	$o->{keyboard}{KEYBOARD} = $other ? $ext_keyboard : $KEYBOARD;
+	$o->{keyboard}{KEYBOARD} = @best <= 1 || $other ? $ext_keyboard : $KEYBOARD;
 	delete $o->{keyboard}{unsafe};
     }
     keyboard::group_toggle_choose($o, $o->{keyboard}) or goto &selectKeyboard;
@@ -217,7 +221,7 @@ sub setupSCSI {
     my ($o) = @_;
 
     if (!$::noauto && arch() =~ /i.86/) {
-	if ($o->{pcmcia} ||= !$::testing && c::pcmcia_probe()) {
+	if ($o->{pcmcia} ||= detect_devices::real_pcmcia_probe()) {
 	    my $w = $o->wait_message(N("PCMCIA"), N("Configuring PCMCIA cards..."));
 	    my $results = modules::configure_pcmcia($o->{pcmcia});
 	    undef $w;
@@ -378,6 +382,12 @@ sub setPackages {
 	pkgs::selectPackagesToUpgrade($o->{packages}, $o->{prefix});
     }
 }
+
+sub selectSupplMedia {
+    my ($o, $suppl_method) = @_;
+    install_any::selectSupplMedia($o, $suppl_method);
+}
+
 #------------------------------------------------------------------------------
 sub choosePackages {
     my ($o, $packages, $compssUsers, $_first_time) = @_;
@@ -410,7 +420,7 @@ sub choosePackages {
     undef $w;
 
   chooseGroups:
-    $o->chooseGroups($packages, $compssUsers, $min_mark, \$individual, $max_size) if !$o->{isUpgrade} && !$::corporate && $o->{meta_class} ne 'desktop';
+    $o->chooseGroups($packages, $compssUsers, $min_mark, \$individual, $max_size) if !$o->{isUpgrade} && $::corporate || $o->{meta_class} ne 'desktop';
 
     ($o->{packages_}{ind}) =
       pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $min_mark, $availableC);
@@ -418,7 +428,7 @@ sub choosePackages {
     $o->choosePackagesTree($packages) or goto chooseGroups if $individual;
 
     install_any::warnAboutRemovedPackages($o, $o->{packages});
-    install_any::warnAboutNaughtyServers($o) or goto chooseGroups if !$o->{isUpgrade};
+    install_any::warnAboutNaughtyServers($o) or goto chooseGroups if !$o->{isUpgrade} && $o->{meta_class} ne 'firewall';
 }
 
 sub choosePackagesTree {
@@ -731,9 +741,15 @@ sub updateModulesFromFloppy {
 #------------------------------------------------------------------------------
 sub configureNetwork {
     my ($o) = @_;
-    require network::network;
-    network::network::easy_dhcp($o->{netc}, $o->{intf}) and $o->{netcnx}{type} = 'lan';
-    $o->SUPER::configureNetwork;
+
+    if ($o->{meta_class} eq 'firewall') {
+	require network::netconnect;
+	network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
+    } else {
+	require network::network;
+	network::network::easy_dhcp($o->{netc}, $o->{intf}) and $o->{netcnx}{type} = 'lan';
+	$o->SUPER::configureNetwork;
+    }
 }
 
 #------------------------------------------------------------------------------
@@ -1140,6 +1156,7 @@ sub setRootPassword {
 	$o->ask_from_({
 	 title => N("Set root password and network authentication methods"), 
 	 messages => N("Set root password"),
+	 advanced_messages => authentication::kind2description(),
 	 interactive_help_id => "setRootPassword",
 	 cancel => ($o->{security} <= 2 && !$::corporate ? 
 		    #-PO: keep this short or else the buttons will not fit in the window
@@ -1154,7 +1171,7 @@ sub setRootPassword {
         } } }, [
 { label => N("Password"), val => \$sup->{password},  hidden => 1 },
 { label => N("Password (again)"), val => \$sup->{password2}, hidden => 1 },
-{ label => N("Authentication"), val => \$authentication_kind, list => [ authentication::kinds() ], format => \&authentication::kind2description, advanced => 1 },
+{ label => N("Authentication"), val => \$authentication_kind, type => 'list', list => [ authentication::kinds() ], format => \&authentication::kind2name, advanced => 1 },
         ]) or delete $sup->{password};
 
 	authentication::ask_parameters($o, $o->{netc}, $o->{authentication}, $authentication_kind) or goto &setRootPassword;
@@ -1235,7 +1252,7 @@ try to force installation even if that destroys the first partition?"));
 sub miscellaneous {
     my ($o, $_clicked) = @_;
 
-    if ($o->{meta_class} ne 'desktop' && !$o->{isUpgrade}) {
+    if ($o->{meta_class} ne 'desktop' && $o->{meta_class} ne 'firewall' && !$o->{isUpgrade}) {
 	require security::level;
 	security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user});
 
@@ -1255,12 +1272,8 @@ sub configureX {
     install_steps::configureXBefore($o);
     symlink "$o->{prefix}/etc/gtk", "/etc/gtk";
 
-    my $options = { 
-	allowFB => $o->{allowFB},
-    };
-
     require Xconfig::main;
-    if (my $raw_X = Xconfig::main::configure_everything_or_configure_chooser($o, $options, !$expert, $o->{keyboard}, $o->{mouse})) {
+    if (my $raw_X = Xconfig::main::configure_everything_or_configure_chooser($o, install_any::X_options_from_o($o), !$expert, $o->{keyboard}, $o->{mouse})) {
 	$o->{raw_X} = $raw_X;
 	install_steps::configureXAfter($o);
     }