summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog6
-rw-r--r--perl-install/Xconfigurator.pm5
-rw-r--r--perl-install/any.pm13
3 files changed, 16 insertions, 8 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index fc0175e2c..ee50921b5 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-28 dam's <damien@mandrakesoft.com>
+
+ * draknet (netconnect): renamed drakfuck -> draknet. standard ADSL
+ and french alcatel ADSL implemented.
+ * Xconfigurator.pm (autologin) : use of the new autologin system.
+
2000-08-24 François Pons <fpons@mandrakesoft.com>
* ../update_kernel*: changed reference from extract_archive to
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 5e1de7617..a65122957 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1105,14 +1105,15 @@ Would you like X to start when you reboot?"), 1);
$l{uid} > 500, $l{name};
} cat_("$o->{prefix}/etc/passwd");
+ my lag='yes'
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};
+ or delete $o->{miscellaneaous}{autologuser} && flag='no';
}
- any::setAutologin($prefix, $o->{miscellaneous}{autologuser}, "kde");
+ any::setAutologin($prefix, $o->{miscellaneous}{autologuser}, "startx", $flag);
}
run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
}
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 36d7a7f0f..7be45a54b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -230,12 +230,13 @@ _("Default") => { val => \$default, type => 'bool' },
}
sub setAutologin {
- my ($prefix, $user, $wm) = @_;
- my $f = "$prefix/etc/X11/xdm/xdm-config";
- my $t1 = "DisplayManager._0.autoUser:";
- my $t2 = "DisplayManager._0.autoString:";
- substInFile { s/^(\Q$t1\E|\Q$t2\E).*\n//; $_ .= "$t1\t$user\n$t2\t$wm\n" if eof && $user } $f;
- # (dam's) : a patch for gdm is being done.
+ my ($prefix, $user, $exe, $flag) = @_;
+ my $f = "$prefix/etc/sysconfig/autologin";
+ my $t1 = "USER=";
+ my $t2 = "EXEC=";
+ my $t3 = "AUTOLOGIN=";
+ substInFile { s/^(\Q$t1\E|\Q$t2\E|\Q$t3\E).*\n//; $_ .= "$t1$user\n$t2$exe\n$t3=$flag" if eof } $f;
+ `chmod 644 $f`;
}