From 84cdf4fa2923a81afa14144fad3fbcb63f52bb26 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 20 Aug 2005 05:10:28 +0000
Subject: Fixed the equality test in the apache init script.

---
 packages/apache/apache_2.0.54.bb | 2 +-
 packages/apache/files/init       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/apache')

diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb
index 882b7f2c71..37138bb87c 100644
--- a/packages/apache/apache_2.0.54.bb
+++ b/packages/apache/apache_2.0.54.bb
@@ -2,7 +2,7 @@ MAINTAINER="David Karlstrom <daka@nslu2-linux.org>"
 SECTION = "net"
 DEPENDS = "openssl expat pcre"
 
-PR = "r2"
+PR = "r3"
 
 # ------------------------------------------
 # NOTE: This package is currently only meant
diff --git a/packages/apache/files/init b/packages/apache/files/init
index 46dae0395f..6c8ff0a6ec 100755
--- a/packages/apache/files/init
+++ b/packages/apache/files/init
@@ -64,7 +64,7 @@ case "$1" in
     ;;
 esac
 
-if [ $? == 0 ]; then
+if [ $? = 0 ]; then
 	echo .
 	exit 0
 else
-- 
cgit v1.2.3


From d8ed0a13ec0521bb309ae3489c41f7e83c099e0d Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 20 Aug 2005 05:28:51 +0000
Subject: Changed the init script name from httpd to apache.

---
 packages/apache/apache_2.0.54.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/apache')

diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb
index 37138bb87c..3ab58c590f 100644
--- a/packages/apache/apache_2.0.54.bb
+++ b/packages/apache/apache_2.0.54.bb
@@ -2,7 +2,7 @@ MAINTAINER="David Karlstrom <daka@nslu2-linux.org>"
 SECTION = "net"
 DEPENDS = "openssl expat pcre"
 
-PR = "r3"
+PR = "r4"
 
 # ------------------------------------------
 # NOTE: This package is currently only meant
@@ -16,7 +16,7 @@ S = "${WORKDIR}/httpd-${PV}"
 
 inherit autotools update-rc.d
 
-INITSCRIPT_NAME = "httpd"
+INITSCRIPT_NAME = "apache"
 INITSCRIPT_PARAMS = "defaults 91 20"
 
 CONFFILES_${PN} = "${sysconfdir}/apache/httpd.conf \
@@ -74,8 +74,8 @@ do_install_append () {
 		    -e 's,/usr/bin/,${bindir}/,g' \
 		    -e 's,/usr/lib,${libdir}/,g' \
 		    -e 's,/etc/,${sysconfdir}/,g' \
-		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/httpd
-	chmod 755 ${D}/${sysconfdir}/init.d/httpd
+		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/apache
+	chmod 755 ${D}/${sysconfdir}/init.d/apache
 	
 	install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf
 	
-- 
cgit v1.2.3