diff options
| author | damien <damien@mandriva.com> | 2000-08-28 13:56:01 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2000-08-28 13:56:01 +0000 |
| commit | 840cab856caa8620d921c97b2c782841fc4be7d8 (patch) | |
| tree | 52d8f65c6b21e8d7b28dbc7e3b37fe09e1506a24 | |
| parent | 7c7255a4033919da032705c9b01c896d37aa85ab (diff) | |
| download | drakx-840cab856caa8620d921c97b2c782841fc4be7d8.tar drakx-840cab856caa8620d921c97b2c782841fc4be7d8.tar.gz drakx-840cab856caa8620d921c97b2c782841fc4be7d8.tar.bz2 drakx-840cab856caa8620d921c97b2c782841fc4be7d8.tar.xz drakx-840cab856caa8620d921c97b2c782841fc4be7d8.zip | |
updated
| -rw-r--r-- | perl-install/Xconfigurator.pm | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/draknet | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index a65122957..66914976e 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -10,6 +10,7 @@ use detect_devices; use run_program; use Xconfigurator_consts; use any; +use modules; use my_gtk qw(:wrappers); my $tmpconfig = "/tmp/Xconfig"; @@ -1105,13 +1106,13 @@ Would you like X to start when you reboot?"), 1); $l{uid} > 500, $l{name}; } cat_("$o->{prefix}/etc/passwd"); - my lag='yes' + my $flag='no'; 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} && flag='no'; + && delete $o->{miscellaneaous}{autologuser} && do { $flag='yes'; system("urpmi --auto autologin"); } ; } any::setAutologin($prefix, $o->{miscellaneous}{autologuser}, "startx", $flag); } diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet index 8c4746fd0..2720a0925 100755 --- a/perl-install/standalone/draknet +++ b/perl-install/standalone/draknet @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use lib qw (/usr/lib/libDrakX); +use lib qw (..); #(/usr/lib/libDrakX); use interactive; use netconnect; |