From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 1 Feb 2014 18:33:50 +0000 (+0100)
Subject: apache: Don't show the signal of sync.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=73794dad879be8c3533030f229e269123ed2a51a

apache: Don't show the signal of sync.

evaluate_retval prints the return code of sync
which is not what we want here.

Also changed some console output.
---

diff --git a/src/initscripts/init.d/apache b/src/initscripts/init.d/apache
index af03776b7..5dd39f939 100644
--- a/src/initscripts/init.d/apache
+++ b/src/initscripts/init.d/apache
@@ -12,10 +12,12 @@ case "$1" in
 		if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then
 			/usr/local/bin/httpscert read >/dev/null 2>&1
 		else
-			boot_mesg "Generating https host certificate... this may take some minutes..."
+			boot_mesg "Generating HTTPS host certificate (may take a couple of minutes)..."
 			/usr/local/bin/httpscert new  >/dev/null 2>&1
-			sync
 			evaluate_retval
+
+			# Make sure that the key is written to disk.
+			sync
 		fi
 		boot_mesg "Starting Apache daemon..."
 		/usr/sbin/apachectl -k start