[patch] Patch for /etc/init.d/xfs

initd-xfs.patch (text/plain), 1.50 KB, created by James Bowlin on 2003-04-07 17:35:59 UTC

--- xfs	2003-04-07 14:08:48.000000000 -0700
+++ xfs.new	2003-04-07 14:05:40.000000000 -0700
@@ -8,2 +8,8 @@
 
+# Modified 2003/03/06 by Jim Bowlin <[e-mail]>
+# changed how ${XFS_PORT} from config file is used so that
+# if there is no XFS_PORT specified then "-port" does not
+# show up in the command line parameters to xfs.
+# This way the XFS_PORT can be commented out by default in
+# the config file. [MAINTAINER: please delete this comment].
 
@@ -13,11 +19,2 @@
 
-check_config() {
-	if [ -z "${XFS_PORT}" ]
-	then
-		eerror "Please set \$XFS_PORT in /etc/conf.d/xfs!"
-		return 1
-	fi
-	return 0
-}
-
 # Return 0 on change, or 1 on no change, or if dir do not exist
@@ -261,4 +258,2 @@
 start() {
-	check_config || return 1
-
 	if [ "${SETUP_FONTDIRS}" = "yes" ]
@@ -269,11 +264,14 @@
 	ebegin "Starting X Font Server"
+        XFS_ARGS="-- -daemon -config /etc/X11/fs/config"
+
+#	`grep -e "^xfs:" /etc/passwd` && echo "found xfs in passwd"
+
 	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
-	else
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
-			-- -daemon -config /etc/X11/fs/config \
-				-port ${XFS_PORT} 1>&2
+		XFS_ARGS="${XFS_ARGS} -droppriv -user xfs"
+	fi
+	if [  "${XFS_PORT}" ] ; then
+		XFS_ARGS="${XFS_ARGS} -port ${XFS_PORT}"
 	fi
+	start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
+		${XFS_ARGS} 1>&2
 	eend $?