diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-10-06 12:03:45 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-10-06 12:03:45 +0000 |
| commit | fc6298c1a2416bb0a87096ba2ae9f5480b614ac6 (patch) | |
| tree | d19dfa108d03f61784e3ff4b0f042b5a401bf946 | |
| parent | f3f346972efc965665d00b18fe4eb2a8360ce96d (diff) | |
| download | drakx-backup-do-not-use-fc6298c1a2416bb0a87096ba2ae9f5480b614ac6.tar drakx-backup-do-not-use-fc6298c1a2416bb0a87096ba2ae9f5480b614ac6.tar.gz drakx-backup-do-not-use-fc6298c1a2416bb0a87096ba2ae9f5480b614ac6.tar.bz2 drakx-backup-do-not-use-fc6298c1a2416bb0a87096ba2ae9f5480b614ac6.tar.xz drakx-backup-do-not-use-fc6298c1a2416bb0a87096ba2ae9f5480b614ac6.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/ChangeLog | 3 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index a06a5e184..8e0bca821 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -8,7 +8,8 @@ license. * Xconfigurator.pm: removed Matrox G200/G400 3D acceleration by - DRI, use only Mesa with Utah GLX. + DRI, use only Mesa with Utah GLX, fixed autologin for avoiding + drakres and no wm available. 2000-10-06 DrakX <install@linux-mandrake.com> diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 3f0863592..2a9d0ce10 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -1126,14 +1126,15 @@ Would you like X to start when you reboot?"), 1); sub autologin { my ($prefix, $o, $in, $install) = @_; + my $cmd = $prefix ? "chroot $prefix" : ""; + my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`)); my @etc_pass_fields = qw(name pw uid gid realname home shell); my @users = mapgrep { my %l; @l{@etc_pass_fields} = split ':'; $l{uid} > 500, $l{name}; } cat_("$prefix/etc/passwd"); - unless (($::auto && $o->{skiptest}) || !@users || $o->{authentication}{NIS} || $ENV{SECURE_LEVEL} > 3) { - my $cmd = $prefix ? "chroot $prefix" : ""; - my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`)); + if (!($::isStandalone && $0 =~ /Xdrakres/) && !($::auto && $o->{skiptest}) && + @wm && @users && !$o->{authentication}{NIS} && $ENV{SECURE_LEVEL} <= 3) { my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin"); $o->{autologin} ||= $l{USER}; $in->ask_from_entries_refH(_("Autologin"), |