Remove installation of ncurses and file at stage0

[hvlinux.git] / stage5 / pkg / apache

diff --git a/stage5/pkg/apache b/stage5/pkg/apache
index ab8b2f7..4e8c1dc 100644 (file)
--- a/stage5/pkg/apache
+++ b/stage5/pkg/apache
@@ -32,9 +32,9 @@ hvconfig_pre()
 </Layout>
 EOF
 
-    groupadd -f ${HTTPD_USER}
-    hv_useradd -c WebServer -d /dev/null -g ${HTTPD_USER} -s /bin/false \
-        ${HTTPD_USER}
+    groupadd --system -f ${HTTPD_USER}
+    hv_useradd --system -c WebServer -d /dev/null -g ${HTTPD_USER} \
+        -s /bin/false ${HTTPD_USER}
 
     CONFIGURE_OPTS=" \
         --enable-layout=FHS \
@@ -140,5 +140,7 @@ EOF
     install -v -m740 ${SCRDIR}/bootscripts/apache /etc/rc.d/init.d
 
     # script-name start stop
-    bootscript_add_rc3 apache 70 20
+    if [ "x${DEFAULT_WEB_SERVER}" == "xhttpd" ]; then
+        bootscript_add_rc3 apache 70 20
+    fi
 }