From 773a87f40ae5955a90f608c51985649be1179f26 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 8 Aug 2002 15:00:07 +0000
Subject: don't add users in group usb (unneeded (?), anyway doesn't do
 anything since group usb doesn't exist currently)

---
 perl-install/install_steps.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 916fd53b9..8e1771068 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -750,8 +750,6 @@ sub addUser {
 	
 	$_->{uid} = $u; $uids{$u} = 1;
 	$_->{gid} = $g; $gids{$g} = 1;
-
-	push @{$_->{groups} ||= []}, 'usb' if $o->{security} <= 3;
     }
 
     any::write_passwd_user($p, $_, $o->{authentication}{md5}) foreach @$users;
@@ -954,7 +952,7 @@ sub miscellaneousBefore {
 
     my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system");
     $o->{miscellaneous}{HDPARM} = $s{HDPARM} if exists $s{HDPARM};
-    $o->{security} ||= any::get_secure_level($o->{prefix}) || ($o->{meta_class} eq 'server' ? 3 : 2);
+    $o->{security} ||= any::get_secure_level($o->{prefix}) || ($o->{meta_class} =~ /server|firewall/ ? 3 : 2);
 
     log::l("security $o->{security}");
 
-- 
cgit v1.2.1