summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-09-20 12:01:30 +0000
committerdamien <damien@mandriva.com>2000-09-20 12:01:30 +0000
commitad8a00814c37a9ca71ea7a661aab6508664d238f (patch)
tree9f350907a2fa1daa425a5ddcab9bb167e98bf0dd /perl-install
parent45992494ccd32cf112f1e9de7ced6257efb18c7b (diff)
downloaddrakx-ad8a00814c37a9ca71ea7a661aab6508664d238f.tar
drakx-ad8a00814c37a9ca71ea7a661aab6508664d238f.tar.gz
drakx-ad8a00814c37a9ca71ea7a661aab6508664d238f.tar.bz2
drakx-ad8a00814c37a9ca71ea7a661aab6508664d238f.tar.xz
drakx-ad8a00814c37a9ca71ea7a661aab6508664d238f.zip
see changelog
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog4
-rw-r--r--perl-install/Xconfigurator.pm2
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index deb875c2d..32eacca0c 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-20 dam's <damien@mandrakesoft.com>
+
+ * Xconfigurator.pm (autologin): for urpmi, added `--best-output' and suspend/resume
+
2000-09-20 Guillaume Cottenceau <gc@mandrakesoft.com>
* standalone/printerdrake: for urpmi, added `--best-output' and suspend/resume
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 42cdad9d2..17a547d3c 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1114,7 +1114,7 @@ If you don't want to use this feature, click on the cancel button."),
[ _("Choose the default user:") => { val => \$o->{autologin}, list => [ '', @users ] },
_("Choose the window manager to run:") => { val => \$o->{desktop}, list => \@wm }, ]) or delete $o->{autologin};
}
- $o->{autologin} and $::isStandalone ? system("urpmi --auto autologin") : $in->pkg_install("autologin");
+ $o->{autologin} and $::isStandalone ? do { $in->suspend; system("urpmi --auto --best-output autologin"); $in->resume; } : $in->pkg_install("autologin");
any::setAutologin($prefix, $o->{autologin}, $o->{desktop});
run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
}