From 336a0bf9555e157a8840c88e1a08614fb52499fc Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 17 Aug 2004 08:07:43 +0000
Subject: $::corporate is dead

---
 perl-install/crypto.pm                    | 2 +-
 perl-install/install2.pm                  | 3 ---
 perl-install/install_steps_interactive.pm | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 5121330c0..908811a32 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -57,7 +57,7 @@ sub mirrors {
 	local $SIG{ALRM} = sub { die "timeout" };
 	alarm 60;
 	my $distro_type = $o_distro_type || 'updates';
-	my $sub_dir = $distro_type =~ /cooker|community/ ? '' : ($::corporate ? '/corporate' : '') . '/' . version();
+	my $sub_dir = $distro_type =~ /cooker|community/ ? '' : '/' . version();
 	foreach (<$f>) {
 	    my ($arch, $url, $dir) = m|$distro_type([^:]*):ftp://([^/]*)(/\S*)| or next;
 	    MDK::Common::System::compat_arch($arch) or
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 3af6d13f8..57ef9fe3c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -23,7 +23,6 @@ use run_program;
 use any;
 use log;
 use fs;
-#-$::corporate=1;
 
 
 #-#######################################################################################
@@ -403,7 +402,6 @@ sub main {
 	    newt      => sub { $o->{interactive} = "newt" },
 	    text      => sub { $o->{interactive} = "newt" },
 	    stdio     => sub { $o->{interactive} = "stdio" },
-	    corporate => sub { $::corporate = 1 },
 	    kickstart => sub { $::auto_install = $v },
 	    uml_install => sub { $::uml_install = 1 },
 	    auto_install => sub { $::auto_install = $v },
@@ -587,7 +585,6 @@ sub main {
 
     if (!$::move && !$::testing) {
 	my $VERSION = cat__(install_any::getFile("VERSION")) or do { print "VERSION file missing\n"; sleep 5 };
-	$::corporate = 1 if $VERSION =~ /corporate/i;
 	$o->{meta_class} = 'desktop' if $VERSION =~ /desktop|discovery/i;
 	$o->{meta_class} = 'download' if $VERSION =~ /download/i;
 	$o->{meta_class} = 'firewall' if $VERSION =~ /firewall/i;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6fd0462b9..b547b138d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -428,7 +428,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} && $o->{meta_class} ne 'desktop';
 
     ($o->{packages_}{ind}) =
       pkgs::setSelectedFromCompssList($packages, $o->{rpmsrate_flags_chosen}, $min_mark, $availableC);
@@ -1161,7 +1161,7 @@ sub setRootPassword {
 	 messages => N("Set root password"),
 	 advanced_messages => authentication::kind2description(),
 	 interactive_help_id => "setRootPassword",
-	 cancel => ($o->{security} <= 2 && !$::corporate ? 
+	 cancel => ($o->{security} <= 2 ? 
 		    #-PO: keep this short or else the buttons will not fit in the window
 		    N("No password") : ''),
 	 focus_first => 1,
-- 
cgit v1.2.1