[Devil-linux-commit] build/scripts httpd,1.3,1.3.2.1 mysql,1.17.2.1,1.17.2.2

[Bruce S. <bl...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8404/scripts

Modified Files:
      Tag: rel-1-2-patches
	httpd mysql 
Log Message:
Moving startup arguments to config.


Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- httpd	11 Jan 2004 14:43:04 -0000	1.3
+++ httpd	10 Aug 2005 13:46:58 -0000	1.3.2.1
@@ -61,6 +61,7 @@
 
 			echo "# Start $MYNAME?" >> $CONFIGFILE
 			echo "START_$MYNAME=no" >> $CONFIGFILE
+			echo "${MYNAME}_PARM=\"-f /etc/apache2/httpd.conf\"" >> $CONFIGFILE
 			echo >> $CONFIGFILE
 			echo "HELP_$MYNAME=\"this is the well known Apache Web server\"" >> $SOFTWAREHELP
 		fi

Index: mysql
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mysql,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- mysql	27 Apr 2005 01:56:27 -0000	1.17.2.1
+++ mysql	10 Aug 2005 13:46:58 -0000	1.17.2.2
@@ -66,6 +66,7 @@
 		if [ "$CONFIG_MYSQL_SERVER" = "y" ]; then
 			echo "# Start MySQL Server?" >> $CONFIGFILE
 			echo "START_MYSQL=no" >> $CONFIGFILE
+			echo "MYSQL_PARM=\"--user=mysql --pid-file=/var/run/mysql.pid --datadir=/var/mysql\"" >> $CONFIGFILE
 			echo >> $CONFIGFILE
 			echo "HELP_MYSQL=\"MySQL is a OpenSource DB Server\"" >> $SOFTWAREHELP
 			cp $MYDIR/scripts/mysqld $ETCDIR/etc/init.d || exit 1