diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-10-08 14:39:55 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-10-08 14:39:55 +0000 |
| commit | 1fd7171432a46f572eaef7c71a6ffe6dc50f479f (patch) | |
| tree | ffa696ee33e46a497c8b3cbfeb92b9fb9e1b5375 | |
| parent | d1b1a87df13793d692a7d19167692624e207e9c2 (diff) | |
| download | drakx-backup-do-not-use-1fd7171432a46f572eaef7c71a6ffe6dc50f479f.tar drakx-backup-do-not-use-1fd7171432a46f572eaef7c71a6ffe6dc50f479f.tar.gz drakx-backup-do-not-use-1fd7171432a46f572eaef7c71a6ffe6dc50f479f.tar.bz2 drakx-backup-do-not-use-1fd7171432a46f572eaef7c71a6ffe6dc50f479f.tar.xz drakx-backup-do-not-use-1fd7171432a46f572eaef7c71a6ffe6dc50f479f.zip | |
do not start an X server if using --text
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rwxr-xr-x | tools/drakx-in-chroot | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 6ce8a9957..a1a9fe58c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- drakx-in-chroot: + o do not start an X server if using --text - continue installing if an advertising image is corrupted (#37674) Version 11.68 - 3 October 2008 diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 5feac78e9..6494c39f4 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -100,7 +100,7 @@ eval { cp_af($_, "$SLASH_LOCATION$_") } foreach qw(/etc/resolv.conf); my $Xnest_pid; my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest'; -if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin) { +if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin && (join('', @ARGV) !~ /--text/)) { my $DISPLAY = ':8'; $Xnest_pid = fork(); if (!$Xnest_pid) { |