saving uncommitted changes in /etc prior to emerge run

diff --git a/apache2/httpd.conf b/apache2/httpd.conf
index 9f0f771ecaafba85ac3e9806f2bde0ff68e633a7..39de446d9e791bc60c9d6e657965e72e3ec4339b 100644 (file)
--- a/apache2/httpd.conf
+++ b/apache2/httpd.conf
@@ -128,6 +128,9 @@ LoadModule log_config_module modules/mod_log_config.so
 LoadModule log_forensic_module modules/mod_log_forensic.so
 LoadModule logio_module modules/mod_logio.so
 LoadModule macro_module modules/mod_macro.so
+<IfDefine SSL>
+LoadModule md_module modules/mod_md.so
+</IfDefine>
 LoadModule mime_module modules/mod_mime.so
 LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule negotiation_module modules/mod_negotiation.so

diff --git a/init.d/apache2 b/init.d/apache2
index 74ba82723566b3ba794bb0cd42015391ae4f739a..3c7e538914439b845439fc1e9f2f8460778c15b3 100755 (executable)
--- a/init.d/apache2
+++ b/init.d/apache2
@@ -34,7 +34,7 @@ APACHE2="/usr/sbin/apache2"
 
 depend() {
        need net
-       use mysql dns logger netmount postgresql
+       use dns entropy logger mysql netmount postgresql
        after sshd
 }
 
@@ -151,7 +151,7 @@ modules() {
 }
 
 fullstatus() {
-       if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+       if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
                eerror "lynx not found! you need to emerge www-client/lynx"
        else
                ${LYNX} ${STATUSURL}
@@ -168,7 +168,7 @@ configdump() {
 
        checkconfd || return 1
 
-       if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+       if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
                eerror "lynx not found! you need to emerge www-client/lynx"
        else
                echo "${APACHE2} started with '${APACHE2_OPTS}'"