|
Lines 8-9
Link Here
|
| 8 |
|
8 |
|
|
|
9 |
# Modified 2003/03/06 by Jim Bowlin <bowlin@mindspring.com> |
| 10 |
# changed how ${XFS_PORT} from config file is used so that |
| 11 |
# if there is no XFS_PORT specified then "-port" does not |
| 12 |
# show up in the command line parameters to xfs. |
| 13 |
# This way the XFS_PORT can be commented out by default in |
| 14 |
# the config file. [MAINTAINER: please delete this comment]. |
| 9 |
|
15 |
|
|
Lines 13-23
Link Here
|
| 13 |
|
19 |
|
| 14 |
check_config() { |
|
|
| 15 |
if [ -z "${XFS_PORT}" ] |
| 16 |
then |
| 17 |
eerror "Please set \$XFS_PORT in /etc/conf.d/xfs!" |
| 18 |
return 1 |
| 19 |
fi |
| 20 |
return 0 |
| 21 |
} |
| 22 |
|
| 23 |
# Return 0 on change, or 1 on no change, or if dir do not exist |
20 |
# Return 0 on change, or 1 on no change, or if dir do not exist |
|
Lines 261-264
Link Here
|
| 261 |
start() { |
258 |
start() { |
| 262 |
check_config || return 1 |
|
|
| 263 |
|
| 264 |
if [ "${SETUP_FONTDIRS}" = "yes" ] |
259 |
if [ "${SETUP_FONTDIRS}" = "yes" ] |
|
Lines 269-279
Link Here
|
| 269 |
ebegin "Starting X Font Server" |
264 |
ebegin "Starting X Font Server" |
|
|
265 |
XFS_ARGS="-- -daemon -config /etc/X11/fs/config" |
| 266 |
|
| 267 |
# `grep -e "^xfs:" /etc/passwd` && echo "found xfs in passwd" |
| 268 |
|
| 270 |
if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then |
269 |
if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then |
| 271 |
start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ |
270 |
XFS_ARGS="${XFS_ARGS} -droppriv -user xfs" |
| 272 |
-- -daemon -config /etc/X11/fs/config \ |
271 |
fi |
| 273 |
-droppriv -user xfs -port ${XFS_PORT} 1>&2 |
272 |
if [ "${XFS_PORT}" ] ; then |
| 274 |
else |
273 |
XFS_ARGS="${XFS_ARGS} -port ${XFS_PORT}" |
| 275 |
start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ |
|
|
| 276 |
-- -daemon -config /etc/X11/fs/config \ |
| 277 |
-port ${XFS_PORT} 1>&2 |
| 278 |
fi |
274 |
fi |
|
|
275 |
start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ |
| 276 |
${XFS_ARGS} 1>&2 |
| 279 |
eend $? |
277 |
eend $? |
