summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-11-22 14:40:22 +0000
committerOlivier Blin <oblin@mandriva.org>2005-11-22 14:40:22 +0000
commitf6164f8f1f68dc6c9534a612f8a8a52753853792 (patch)
tree5a96fdb82ec00c23018ff04bda942edf9c49f0d7
parent7d6d36ce2d6c5fc460a0b5114db60d5b39c1fb10 (diff)
downloaddrakx-f6164f8f1f68dc6c9534a612f8a8a52753853792.tar
drakx-f6164f8f1f68dc6c9534a612f8a8a52753853792.tar.gz
drakx-f6164f8f1f68dc6c9534a612f8a8a52753853792.tar.bz2
drakx-f6164f8f1f68dc6c9534a612f8a8a52753853792.tar.xz
drakx-f6164f8f1f68dc6c9534a612f8a8a52753853792.zip
don't run Xnest if an auto_install file is used
-rw-r--r--tools/drakx-in-chroot2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 10ae26e27..fbda29eb9 100644
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -57,7 +57,7 @@ create_initial_devices();
output("$SLASH_LOCATION/etc/hosts", "127.0.0.1 localhost\n") if ! -e "$SLASH_LOCATION/etc/hosts";
my $Xnest_pid;
-if (whereis_binary('Xnest')) {
+if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && whereis_binary('Xnest')) {
my $DISPLAY = ':8';
$Xnest_pid = fork();
if (!$Xnest_pid) {