More fixes for apache upgrade function.

diff --git a/src/functions.sh b/src/functions.sh
index 35cfa6b..09821a3 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -492,6 +492,13 @@ upgrade_apache () {
   mkdir -p /etc/apache2
   touch /etc/apache2/httpd.conf
 
+  # register cn changes in modules.conf
+  modules_conf=/etc/apache/modules.conf
+  if [ ! -e "$modules_conf.cn4-upgrade" ]; then
+      cp "$modules_conf" "$modules_conf.cn4-upgrade"
+      ucf $modules_conf $modules_conf
+  fi
+
   # temporary remove packages conflicting with apache2
   delpkg=""
   for p in aosi-aai aosi-www-aai \
@@ -505,7 +512,9 @@ upgrade_apache () {
   done
 
   # remove problematic stuff
-  eval apt-get --yes remove $delpkg
+  if [ "$delpkg" ]; then
+      eval apt-get --yes remove $delpkg
+  fi
 
   # remove old apache
   pkgrm apache apache-common