summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-12-12 13:58:59 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-12-12 13:58:59 +0100
commit644f41d665f168bc0f77289ef7138198ecf13fa8 (patch)
tree311c35dcd1e6cd770212afc9817ea04bba3238ff
parentdaaa05fb595982ab99353ae9d51898963f52f1a1 (diff)
downloaddrakx-644f41d665f168bc0f77289ef7138198ecf13fa8.tar
drakx-644f41d665f168bc0f77289ef7138198ecf13fa8.tar.gz
drakx-644f41d665f168bc0f77289ef7138198ecf13fa8.tar.bz2
drakx-644f41d665f168bc0f77289ef7138198ecf13fa8.tar.xz
drakx-644f41d665f168bc0f77289ef7138198ecf13fa8.zip
fix running with xserver-1.18
-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 d4be788af..4f2d92ffe 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- drakx-in-chroot:
+ o fix running with xserver-1.18
+
Version 17.5 - 8 december 2015
- more substitution for task-plasma5
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 02cf53ce4..4fe2f014c 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -142,7 +142,7 @@ if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin && join('', @ARGV
if (!$Xnest_pid) {
exec $Xnest_bin, $DISPLAY, '-ac', ($Xnest_bin eq 'Xephyr' ? '-screen' : '-geometry'), $resolution or die "Xnest failed\n";
}
- $ENV{DISPLAY} = '127.0.0.1' . $DISPLAY;
+ $ENV{DISPLAY} = $DISPLAY;
}
if (my $pid = fork()) {