summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2011-05-25 07:28:52 +0000
committerAntoine Ginies <aginies@mandriva.com>2011-05-25 07:28:52 +0000
commitec7300a443d5b07b387061b31218f132d6c96247 (patch)
tree1c809682ffd794c7eeca91dac9896548b53887df
parente018e6f076924609965bdad7005c44739ff1996f (diff)
downloaddrakx-backup-do-not-use-ec7300a443d5b07b387061b31218f132d6c96247.tar
drakx-backup-do-not-use-ec7300a443d5b07b387061b31218f132d6c96247.tar.gz
drakx-backup-do-not-use-ec7300a443d5b07b387061b31218f132d6c96247.tar.bz2
drakx-backup-do-not-use-ec7300a443d5b07b387061b31218f132d6c96247.tar.xz
drakx-backup-do-not-use-ec7300a443d5b07b387061b31218f132d6c96247.zip
remove xguest
-rw-r--r--perl-install/any.pm12
1 files changed, 0 insertions, 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};