summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-06-06 19:33:10 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-06-06 19:33:10 +0000
commit7793ef4a6d56bfe4821ffaeeede5b9857a73ef5f (patch)
tree55259c84e665c8a0bf515b33c53ec9eff35b4f1a /x11-base
parentfreshly baked (diff)
downloadgentoo-2-7793ef4a6d56bfe4821ffaeeede5b9857a73ef5f.tar.gz
gentoo-2-7793ef4a6d56bfe4821ffaeeede5b9857a73ef5f.tar.bz2
gentoo-2-7793ef4a6d56bfe4821ffaeeede5b9857a73ef5f.zip
xfs rc-script update
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog7
-rw-r--r--x11-base/xfree/files/4.2.0-r11/xfs.start4
2 files changed, 8 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 0672e03fccff..60c26bbd351f 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,9 +1,14 @@
# ChangeLog for x11-base/xfree
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.22 2002/06/02 21:07:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.23 2002/06/06 19:33:10 azarah Exp $
*xfree-4.2.0-r11 (28 May 2002)
+ 6 Jun 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild :
+
+ Update grep expression to determine if the "xfs" user exist in
+ /etc/init.d/xfs; bug #3314.
+
2 Jun 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild :
Some more symlink cleanups. Dont nuke the host.def, just filter our
diff --git a/x11-base/xfree/files/4.2.0-r11/xfs.start b/x11-base/xfree/files/4.2.0-r11/xfs.start
index 16c824341792..5ffeab04b93b 100644
--- a/x11-base/xfree/files/4.2.0-r11/xfs.start
+++ b/x11-base/xfree/files/4.2.0-r11/xfs.start
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/xfs.start,v 1.2 2002/05/31 15:38:03 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/xfs.start,v 1.3 2002/06/06 19:33:10 azarah Exp $
#NB: Config is in /etc/conf.d/xfs
@@ -22,7 +22,7 @@ check_config() {
start() {
check_config || return 1
ebegin "Starting X Font Server"
- if [ "`grep xfs /etc/passwd`" ] ; then
+ if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then
start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
-- -daemon -config /etc/X11/fs/config \
-droppriv -user xfs -port ${XFS_PORT} 1>&2