rpms/xorg-x11-xfs/devel xfs.init, 1.8, 1.9 xorg-x11-xfs.spec, 1.35, 1.36

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14101

Modified Files:
	xfs.init xorg-x11-xfs.spec 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.0.5-5
- xfs.init: Fix mkdir race (#492517)



Index: xfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/devel/xfs.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfs.init	27 Jul 2007 16:06:21 -0000	1.8
+++ xfs.init	13 Apr 2009 18:59:00 -0000	1.9
@@ -56,12 +56,12 @@
    FONT_UNIX_DIR=/tmp/.font-unix
    echo -n $"Starting $prog: "
    [ -x /usr/sbin/chkfontpath ] && buildfontlist
-   # Clean out .font-unix dir, and recreate it with the proper ownership and
-   # permissions.
-   rm -rf $FONT_UNIX_DIR
-   mkdir $FONT_UNIX_DIR
-   chown root:root $FONT_UNIX_DIR
-   chmod 1777 $FONT_UNIX_DIR
+   # Make sure .font-unix dir, exists.
+   if [ ! -d $FONT_UNIX_DIR ]
+   then
+       mkdir -m 1777 $FONT_UNIX_DIR || :
+       restorecon $FONT_UNIX_DIR 2>/dev/null || :
+   fi
    # Fix needed for SELinux for bug (#130421,130969)
    [ -x /sbin/restorecon ] && /sbin/restorecon $FONT_UNIX_DIR
 


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-xfs.spec	26 Feb 2009 11:39:52 -0000	1.35
+++ xorg-x11-xfs.spec	13 Apr 2009 18:59:01 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-xfs
 Version: 1.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT
@@ -244,6 +244,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.0.5-5
+- xfs.init: Fix mkdir race (#492517)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild