summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <dev@blino.org>2016-08-18 16:39:01 +0200
committerOlivier Blin <dev@blino.org>2016-08-18 16:39:01 +0200
commit6d4c6d783e603f740506d4849ae669f96aef5406 (patch)
treee17c9f95a0801e9da0ebc80912168d061a1e0621
parent36bd449ae24cec5b067dbdbe5f679e8ee1ff4096 (diff)
downloaddrakx-6d4c6d783e603f740506d4849ae669f96aef5406.tar
drakx-6d4c6d783e603f740506d4849ae669f96aef5406.tar.gz
drakx-6d4c6d783e603f740506d4849ae669f96aef5406.tar.bz2
drakx-6d4c6d783e603f740506d4849ae669f96aef5406.tar.xz
drakx-6d4c6d783e603f740506d4849ae669f96aef5406.zip
drakx-in-chroot: do not die if Xephyr is not found in text mode
-rwxr-xr-xtools/drakx-in-chroot4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 72f0c705f..5bcd9d533 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -135,8 +135,8 @@ eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION/etc/resolv.conf") };
}
my $Xnest_pid;
-my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest' or die "Xephyr not found! Please install x11-server-xephyr!\n";
-if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin && join('', @ARGV) !~ /--text/) {
+if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && join('', @ARGV) !~ /--text/) {
+ my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest' or die "Xephyr not found! Please install x11-server-xephyr!\n";
my $DISPLAY = ':8';
$Xnest_pid = fork();
if (!$Xnest_pid) {