X Strike Force X.Org X11 SVN commit: r891 - trunk/debian
Author: dnusinow
Date: 2005-11-23 19:10:17 -0500 (Wed, 23 Nov 2005)
New Revision: 891
Modified:
trunk/debian/changelog
trunk/debian/xserver-xorg.postinst.in
Log:
* In xserver-xorg config, only update symlink to X server if it is in fact a
symlink and is not already pointing to where it's supposed to go. This
avoids problems on thin clients. Thanks Petter Reinholdtsen,
(closes: #336748)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-11-23 19:34:18 UTC (rev 890)
+++ trunk/debian/changelog 2005-11-24 00:10:17 UTC (rev 891)
@@ -10,6 +10,10 @@
Vernazobres. (closes: #340443, #337650)
* Add general/032_fix_matrox_display.diff to fix corruption on some cards.
Thanks Julien Wajsberg. (closes: #320328)
+ * In xserver-xorg config, only update symlink to X server if it is in fact a
+ symlink and is not already pointing to where it's supposed to go. This
+ avoids problems on thin clients. Thanks Petter Reinholdtsen,
+ (closes: #336748)
[ Christian Perrier ]
* Updated Russian translation (ru.po). Thanks, Yuri Kozlov!
@@ -17,7 +21,7 @@
* Added Romanian translation (ro.po). Thanks, Eddy Petrisor!
(closes: #338547, #338902).
- -- David Nusinow <dnusinow@debian.org> Wed, 23 Nov 2005 14:33:08 -0500
+ -- David Nusinow <dnusinow@debian.org> Wed, 23 Nov 2005 19:07:08 -0500
xorg-x11 (6.8.2.dfsg.1-10) unstable; urgency=low
Modified: trunk/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xserver-xorg.postinst.in 2005-11-23 19:34:18 UTC (rev 890)
+++ trunk/debian/xserver-xorg.postinst.in 2005-11-24 00:10:17 UTC (rev 891)
@@ -733,7 +733,7 @@
db_get shared/default-x-server
if [ -n "$RET" ]; then
SELECTED_PACKAGE="$RET"
- if [ "$SELECTED_PACKAGE" = "$THIS_PACKAGE" ]; then
+ if [ "$SELECTED_PACKAGE" = "$THIS_PACKAGE" ] && [ -L "$SERVER_SYMLINK" ] && [ "$(readlink "$SERVER_SYMLINK")" != "$THIS_SERVER" ]; then
# prepare a new version of the config file; this is a symlink so we
# can't use the tempfile command for it (we'd have to subsequently
# use ln -sf, which is subject to race condition attacks)
Reply to: