From 7793ef4a6d56bfe4821ffaeeede5b9857a73ef5f Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Thu, 6 Jun 2002 19:33:10 +0000 Subject: xfs rc-script update --- x11-base/xfree/ChangeLog | 7 ++++++- x11-base/xfree/files/4.2.0-r11/xfs.start | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'x11-base') 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 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 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 -- cgit v1.2.3-65-gdbad