diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-17 04:23:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-17 04:23:44 +0000 |
| commit | 3b5bc9b469a09d5000a56aa138d4362f1f4e5be9 (patch) | |
| tree | c104f00d5b9430dd7372aef34247fce7ca6035c2 /x11-apps | |
| parent | Add patch to build on non-x86 arches (diff) | |
| download | gentoo-2-3b5bc9b469a09d5000a56aa138d4362f1f4e5be9.tar.gz gentoo-2-3b5bc9b469a09d5000a56aa138d4362f1f4e5be9.tar.bz2 gentoo-2-3b5bc9b469a09d5000a56aa138d4362f1f4e5be9.zip | |
Dont loop forever trying to create /tmp/.font-unix. If it fails sanity, then just abort the process.
(Portage version: 2.2_pre5)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xfs/ChangeLog | 6 | ||||
| -rwxr-xr-x | x11-apps/xfs/files/xfs.start | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog index cc3d0e0311cd..dfe3562da797 100644 --- a/x11-apps/xfs/ChangeLog +++ b/x11-apps/xfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xfs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.51 2008/03/10 01:57:30 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.52 2008/04/17 04:23:44 vapier Exp $ + + 17 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/xfs.start: + Dont loop forever trying to create /tmp/.font-unix. If it fails sanity, then + just abort the process. 10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: Bump. diff --git a/x11-apps/xfs/files/xfs.start b/x11-apps/xfs/files/xfs.start index 9290a0ec60f9..ca3b456548ce 100755 --- a/x11-apps/xfs/files/xfs.start +++ b/x11-apps/xfs/files/xfs.start @@ -1,8 +1,8 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.3 2007/09/30 08:21:18 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.4 2008/04/17 04:23:44 vapier Exp $ #NB: Config is in /etc/conf.d/xfs @@ -306,12 +306,18 @@ start() { ebegin "Starting X Font Server" if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then + local sanity=0 # Fix possible race condition, bug #185660 while ! [ -d /tmp/.font-unix ]; do # Fix possible security problem, turned to hard failure in 6.8.0 # See discussion at http://freedesktop.org/bugzilla/show_bug.cgi?id=306 rm -rf /tmp/.font-unix mkdir -m 1777 /tmp/.font-unix + ((sanity+=1)) + if [ ${sanity} -gt 1000 ] ; then + eend 1 "i give up" + return 1 + fi done start-stop-daemon --start --quiet --exec /usr/bin/xfs \ |