summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-05 14:29:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-05 14:29:16 +0000
commit31de738c99ce16ee26595d7bf2d6e9500a5a10b1 (patch)
tree30cb27258fcac641440869517e35e28f29177eb1 /perl-install/Xconfigurator.pm
parentf093421759947c0e1020139c8b0bdb057105c074 (diff)
downloaddrakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.gz
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.bz2
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.xz
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm14
1 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index f0f51c162..bbac283d3 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -9,6 +9,7 @@ use log;
use detect_devices;
use run_program;
use Xconfigurator_consts;
+use any;
use my_gtk qw(:wrappers);
my $tmpconfig = "/tmp/Xconfig";
@@ -1020,7 +1021,7 @@ sub main {
}
my $ok = resolutionsConfiguration($o, auto => $::auto, noauto => $::noauto);
- $ok &&= testFinalConfig($o, $::auto, $::skiptest);
+ $ok &&= testFinalConfig($o, $::auto, $o->{skiptest});
my $quit;
until ($ok || $quit) {
@@ -1095,14 +1096,15 @@ Would you like X to start when you reboot?"), 1);
$l{uid} > 500, $l{name};
} cat_("$o->{prefix}/etc/passwd");
- !(exists $o->{miscellaneous}{autologuser} || $::auto || !@users || exists $o->{authentication}{NIS} ) &&
+ unless (exists $o->{miscellaneous}{autologuser} || $::auto || !@users || $o->{authentication}{NIS}) {
$in->ask_from_entries_refH(_("Autologin"),
_("I can set up your computer to automatically log on one user.
If you don't want to use this feature, click on the cancel button."),
-[ _("Choose the default user :") => {val => \$o->{miscellaneous}{autologuser}, list => \@users, not_edit => 1} ], )
- or delete $o->{miscellaneaous}{autologuser};
- set_autologin($prefix, $o->{miscellaneous}{autologuser}, "kde" ) if (@users && !exists $o->{authentication}{NIS} && exists $o->{miscellaneous}{autologuser});
- }
+ [ _("Choose the default user :") => {val => \$o->{miscellaneous}{autologuser}, list => \@users, not_edit => 1} ])
+ or delete $o->{miscellaneaous}{autologuser};
+ }
+ any::setAutologin($prefix, $o->{miscellaneous}{autologuser}, "kde");
+ }
run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
}
}