From ec7300a443d5b07b387061b31218f132d6c96247 Mon Sep 17 00:00:00 2001 From: Antoine Ginies Date: Wed, 25 May 2011 07:28:52 +0000 Subject: remove xguest --- perl-install/any.pm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index a76cf12d2..daa8a6d22 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -825,14 +825,9 @@ sub ask_user { ask_user_and_root($in, undef, $users, $security, %options); } -sub is_xguest_installed() { - -e "$::prefix/etc/security/namespace.d/xguest.conf"; -} - sub ask_user_and_root { my ($in, $superuser, $users, $security, %options) = @_; - my $xguest = is_xguest_installed(); $options{needauser} ||= $security >= 3; @@ -880,7 +875,6 @@ sub ask_user_and_root { if_($::isInstall && $superuser, cancel => ''), }, [ $superuser ? ( - { text => N("Enable guest account"), val => \$xguest, type => 'bool', advanced => 1 }, { label => N("Set administrator (root) password"), title => 1 }, { label => N("Password"), val => \$superuser->{password}, hidden => 1, alignment => 'right', weakness_check => 1, focus => sub { 1 }, @@ -915,12 +909,6 @@ sub ask_user_and_root { ], ); - if ($xguest && !is_xguest_installed()) { - $in->do_pkgs->ensure_is_installed('xguest', '/etc/security/namespace.d/xguest.conf'); - } elsif (!$xguest && is_xguest_installed()) { - $in->do_pkgs->remove('xguest') or return; - } - $u->{groups} = [ grep { $groups{$_} } keys %groups ]; push @$users, $u if $u->{name}; -- cgit v1.2.1