From 6d4c6d783e603f740506d4849ae669f96aef5406 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 18 Aug 2016 16:39:01 +0200 Subject: drakx-in-chroot: do not die if Xephyr is not found in text mode --- tools/drakx-in-chroot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') 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) { -- cgit v1.2.1