X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=35cfa6b1fb99f21ab4e44ea3ea7582b9551aed67;hb=f16234f109aad6608cdb86ab0a37c782cb4d4c04;hp=b638104a1c7e16041293069ac8f45405276ea259;hpb=93658add65079b4a5a5b678150d3d53805bb3c32;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index b638104..35cfa6b 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -328,11 +328,8 @@ add_group_proc () {
     log "groupadd -g 99 proc"
 
     # update oidentd so it uses the proc group
-    if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ]; then
-	if check_and_sed '^OIDENT_GROUP=oident' \
-                         's/^\(OIDENT_GROUP\)=.*/\1=proc/' \
-                         /etc/default/oidentd;
-        then
+    if [ -x /etc/init.d/oidentd ]; then
+        if gpasswd -a oident proc; then
             /etc/init.d/oidentd restart
         fi
     fi
@@ -473,6 +470,16 @@ install_keyrings () {
   update
 }
 
+# remove skey (not supported anymore)
+remove_skey () {
+  pkgrm skey-cn libpam-skey
+
+  if getent group skey > /dev/null; then
+    groupdel skey || true
+    log "groupdel skey"
+  fi
+}
+
 # make a silent upgrade to new libc6
 upgrade_libc () {
   DEBIAN_FRONTEND=noninteractive pkgadd libc6
@@ -490,9 +497,17 @@ upgrade_apache () {
   for p in aosi-aai aosi-www-aai \
            php4-cn php4-odbc php4-xslt \
            squirrelmail-cn; do
-     pkg p && delpkg="$delpkg $p"
+
+     # remember installed packages
+     if pkg $p; then
+         delpkg="$delpkg $p"
+     fi
   done
-  eval pkgrm $delpkg
+
+  # remove problematic stuff
+  eval apt-get --yes remove $delpkg
+
+  # remove old apache
   pkgrm apache apache-common
 
   # install new packages