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
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