summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-12-20 14:46:08 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-20 14:46:08 +0100
commit64d1f0f2e257e7fbf701de7de40ea6240c43d290 (patch)
tree929369048295bb363a5c4c928792f0dfb8e56115
parent5a773fbf89098e38bd0f6c86b93e72d1000808c9 (diff)
downloaddrakx-64d1f0f2e257e7fbf701de7de40ea6240c43d290.tar
drakx-64d1f0f2e257e7fbf701de7de40ea6240c43d290.tar.gz
drakx-64d1f0f2e257e7fbf701de7de40ea6240c43d290.tar.bz2
drakx-64d1f0f2e257e7fbf701de7de40ea6240c43d290.tar.xz
drakx-64d1f0f2e257e7fbf701de7de40ea6240c43d290.zip
advise to install xephyr if missing
-rw-r--r--perl-install/install/NEWS3
-rwxr-xr-xtools/drakx-in-chroot2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a1a40446d..8744fb7df 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- drakx-in-chroot:
+ o advise to install xephyr if missing
+
Version 16.14 - 10 December 2013
- Mageia 4 beta 2 left background
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 0992b49c2..af1e51c1c 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -131,7 +131,7 @@ eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION/etc/resolv.conf") };
}
my $Xnest_pid;
-my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest';
+my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest' or die "Xephyr not find! Please install x11-server-xephyr!\n";
if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin && join('', @ARGV) !~ /--text/) {
my $DISPLAY = ':8';
$Xnest_pid = fork();