From 60bea8a37fb6ed08f44db775dda0149ba5fae0be Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 31 Aug 2007 08:37:06 +0000
Subject: drop special code based on meta_class "desktop" or "firewall". those
 meta_class are obsolete

---
 perl-install/install/gtk.pm               |  2 +-
 perl-install/install/install2.pm          |  2 +-
 perl-install/install/steps_interactive.pm | 17 ++---------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index dcb30f8a4..b004181f4 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -163,7 +163,7 @@ sub create_logo_window {
 
     mygtk2::may_destroy($o->{logo_window});
 
-    my $file = $o->{meta_class} eq 'firewall' ? "logo-mandriva-Firewall.png" : "logo-mandriva.png";
+    my $file = "logo-mandriva.png";
 
     $o->{logo_window} =
       gtknew('Window', 
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 5d50eae6c..dcb162c46 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -253,7 +253,7 @@ sub configureNetwork {
 #------------------------------------------------------------------------------
 sub installUpdates {
     my ($auto) = @_;
-    installStepsCall($o, $auto, 'installUpdates') if $o->{meta_class} ne 'firewall';
+    installStepsCall($o, $auto, 'installUpdates');
 }
 #------------------------------------------------------------------------------
 sub configureServices {
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index a8b9fd76d..33e2c3b30 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -356,7 +356,7 @@ sub choosePackages {
     my $min_mark = 4;
 
   chooseGroups:
-    $o->chooseGroups($o->{packages}, $o->{compssUsers}, $min_mark, \$individual) if !$o->{isUpgrade} && $o->{meta_class} ne 'desktop';
+    $o->chooseGroups($o->{packages}, $o->{compssUsers}, $min_mark, \$individual) if !$o->{isUpgrade};
 
     ($o->{packages_}{ind}) =
       install::pkgs::setSelectedFromCompssList($o->{packages}, $o->{rpmsrate_flags_chosen}, $min_mark, $availableC);
@@ -364,7 +364,7 @@ sub choosePackages {
     $o->choosePackagesTree($o->{packages}) or goto chooseGroups if $individual;
 
     install::any::warnAboutRemovedPackages($o, $o->{packages});
-    install::any::warnAboutNaughtyServers($o) or goto chooseGroups if !$o->{isUpgrade} && $o->{meta_class} ne 'firewall';
+    install::any::warnAboutNaughtyServers($o) or goto chooseGroups if !$o->{isUpgrade};
 }
 
 sub choosePackagesTree {
@@ -525,7 +525,6 @@ sub reallyChooseGroups {
 		  changed => sub { $size_text = &$size_to_display },
 		 };
 	   } @$compssUsers),
-	 if_($o->{meta_class} eq 'desktop', { text => N("All"), val => \$all, type => 'bool' }),
 	 if_($individual, { text => N("Individual package selection"), val => $individual, advanced => 1, type => 'bool' }),
     ]);
 
@@ -615,17 +614,12 @@ sub updatemodules {
 #------------------------------------------------------------------------------
 sub configureNetwork {
     my ($o) = @_;
-    if ($o->{meta_class} eq 'firewall') {
-	require network::netconnect;
-	network::netconnect::real_main($o->{net}, $o, $o->{modules_conf});
-    } else {
 	#- don't overwrite configuration in a network install
 	if (!install::any::is_network_install($o)) {
 	    require network::network;
 	    network::network::easy_dhcp($o->{net}, $o->{modules_conf});
 	}
 	$o->SUPER::configureNetwork;
-    }
 }
 
 #------------------------------------------------------------------------------
@@ -1007,13 +1001,6 @@ sub check_security_level {
 sub miscellaneous {
     my ($o, $_clicked) = @_;
 
-    if (0 && $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});
-
-     check_security_level($o) or goto &miscellaneous;
-    }
-
     install::steps::miscellaneous($o);
 }
 
-- 
cgit v1.2.1