X Strike Force X.Org X11 SVN commit: r4180 - in trunk/debian/xorg/debian: . local
Author: julien
Date: 2007-01-06 13:28:11 -0500 (Sat, 06 Jan 2007)
New Revision: 4180
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/local/dexconf
Log:
* Fix dexconf to work when $TMPDIR is NFS-mounted, by closing the redirected
file descriptor before trying to rm $DEXCONFTMPDIR (closes: #405782).
Thanks to Boris Dores for the report, and to Brice Goglin for the patch.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2007-01-06 09:39:04 UTC (rev 4179)
+++ trunk/debian/xorg/debian/changelog 2007-01-06 18:28:11 UTC (rev 4180)
@@ -6,8 +6,11 @@
pulled in on initial install.
* Add xserver-xorg-input-void to xserver-xorg-input-all's dependencies on
s390.
+ * Fix dexconf to work when $TMPDIR is NFS-mounted, by closing the redirected
+ file descriptor before trying to rm $DEXCONFTMPDIR (closes: #405782).
+ Thanks to Boris Dores for the report, and to Brice Goglin for the patch.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Mon, 1 Jan 2007 19:54:08 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Sat, 6 Jan 2007 19:13:12 +0100
xorg (1:7.1.0-9) unstable; urgency=high
Modified: trunk/debian/xorg/debian/local/dexconf
===================================================================
--- trunk/debian/xorg/debian/local/dexconf 2007-01-06 09:39:04 UTC (rev 4179)
+++ trunk/debian/xorg/debian/local/dexconf 2007-01-06 18:28:11 UTC (rev 4180)
@@ -117,6 +117,7 @@
trap 'if [ -e "$DEXCONFTMPDIR/backup" ] && [ -n "$XF86CONFIG" ]; then \
cat "$DEXCONFTMPDIR/backup" >"$XF86CONFIG"; \
fi; \
+ exec 4<&-; \
rm -rf "$DEXCONFTMPDIR"; \
bomb "received signal; aborting"' HUP INT QUIT TERM
@@ -414,6 +415,9 @@
EndSection
SECTION
+# Close file descriptor 4 before we delete temporary files
+exec 4<&-
+
# Tell debconf to stop listening to us.
db_stop
Reply to: