diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-04-23 12:13:45 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-04-23 12:13:45 +0000 |
| commit | 72353d4effe216b2cd9680c74668bdaac35a64c6 (patch) | |
| tree | 30a14ee14880bd9e1beacad062a413df1f6c3f9a | |
| parent | 992528cdd70f08a19d77dcaf15e7bc1bd2097da1 (diff) | |
| download | drakx-backup-do-not-use-72353d4effe216b2cd9680c74668bdaac35a64c6.tar drakx-backup-do-not-use-72353d4effe216b2cd9680c74668bdaac35a64c6.tar.gz drakx-backup-do-not-use-72353d4effe216b2cd9680c74668bdaac35a64c6.tar.bz2 drakx-backup-do-not-use-72353d4effe216b2cd9680c74668bdaac35a64c6.tar.xz drakx-backup-do-not-use-72353d4effe216b2cd9680c74668bdaac35a64c6.zip | |
handle --auto
| -rw-r--r-- | perl-install/Xconfig/various.pm | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/XFdrake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm index 5849a1c17..1aa0dd1be 100644 --- a/perl-install/Xconfig/various.pm +++ b/perl-install/Xconfig/various.pm @@ -66,7 +66,7 @@ sub choose_xdm { my ($in, $b_auto) = @_; my $xdm = $::isStandalone ? runlevel() == 5 : 1; - if (!$b_auto || $::isStandalone) { + if (!$b_auto) { $xdm = $in->ask_yesorno_({ title => N("Graphical interface at startup"), messages => diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 6aec02673..c5c678361 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -88,6 +88,7 @@ sub ask_for_X_restart { return; } + return if $::auto; $in->ask_okcancel('', N("You need to log out and back in again for changes to take effect"), 1) or return; if (fork()) { |