From: Valentin Vidic Date: Wed, 23 Jan 2008 13:21:09 +0000 (+0100) Subject: Make restore_config check package version before doing the restore. X-Git-Tag: debian/4.0.1~62 X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=93658add65079b4a5a5b678150d3d53805bb3c32;p=carnet-upgrade.git Make restore_config check package version before doing the restore. --- diff --git a/src/functions.sh b/src/functions.sh index 7a14d80..b638104 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -393,12 +393,20 @@ fix_etc_default_raid2 () { fi } -# restore distribution config file +# restore original config file (if the new package version is not +# installed already) restore_config () { local file file_backup + local pkg=$1 ver=$2 + shift 2 - for file in "$@"; do + # check package version + pkg $pkg lt $ver || return 0 + + # restore package files + for file in $*; do file_backup=$file.cn4-upgrade + if [ -e $file -a ! -e $file_backup ]; then # backup file mv $file $file_backup @@ -413,39 +421,47 @@ restore_config () { # restore modified config to their package defaults # so the upgrade doesn't complain so much restore_configs () { - restore_config /etc/bind/named.conf.options - restore_config /etc/default/ntpdate - restore_config /etc/default/oidentd - restore_config /etc/default/postgrey - restore_config /etc/default/saslauthd - restore_config /etc/default/slapd - restore_config /etc/dovecot/dovecot.conf - restore_config /etc/init.d/mysql - restore_config /etc/init.d/slapd - restore_config /etc/issue - restore_config /etc/issue.net - restore_config /etc/logrotate.d/mysql-server - restore_config /etc/mysql/my.cnf - restore_config /etc/ntp.conf - restore_config /etc/pam.d/login - restore_config /etc/php4/apache/php.ini - restore_config /etc/php4/cgi/php.ini - restore_config /etc/php4/cli/php.ini - restore_config /etc/postgrey/whitelist_clients - restore_config /etc/security/limits.conf - restore_config /etc/squirrelmail/apache.conf - restore_config /etc/sysctl.conf - restore_config /etc/vsftpd.conf - restore_config /etc/xinetd.conf + restore_config base-files 4 /etc/issue /etc/issue.net + restore_config bind9 1:9.3.4 /etc/bind/named.conf.options + restore_config dovecot-common 1.0 /etc/dovecot/dovecot.conf + restore_config libapache-mod-php4 6:4.4.4 /etc/php4/apache/php.ini + restore_config libpam-modules 0.79 /etc/security/limits.conf + restore_config login 1:4.0.18.1 /etc/pam.d/login + restore_config mysql-server 5.0.3 /etc/init.d/mysql \ + /etc/logrotate.d/mysql-server \ + /etc/mysql/my.cnf + restore_config ntp 1:4.2.2 /etc/ntp.conf + restore_config ntpdate 1:4.2.2 /etc/default/ntpdate + restore_config oidentd 2.0.8 /etc/default/oidentd + restore_config php4-cgi 6:4.4.4 /etc/php4/cgi/php.ini + restore_config php4-cli 6:4.4.4 /etc/php4/cli/php.ini + restore_config postgrey 1.27 /etc/default/postgrey \ + /etc/postgrey/whitelist_clients + restore_config procps 1:3.2.7 /etc/sysctl.conf + restore_config sasl2-bin 2.1.22 /etc/default/saslauthd + restore_config slapd 2.3.30 /etc/default/slapd /etc/init.d/slapd + restore_config squirrelmail 2:1.4.9a /etc/squirrelmail/apache.conf + restore_config vsftpd 2.0.5 /etc/vsftpd.conf + restore_config xinetd 1:2.3.14 /etc/xinetd.conf # orphaned config file - no owner - rm -f /etc/logcheck/ignore.d.server/imap + if pkg logcheck-database lt 1.2.54; then + rm -f /etc/logcheck/ignore.d.server/imap + fi # aide switched to ucf, move old configs aside - for file in /etc/aide/aide.conf /etc/cron.daily/aide /etc/default/aide; do - [ ! -e "$file.cn4-upgrade" ] && mv "$file" "$file.cn4-upgrade" - rm -f "$file" - done + if pkg aide lt 0.13.1; then + for file in /etc/aide/aide.conf \ + /etc/cron.daily/aide \ + /etc/default/aide; + do + if [ ! -e "$file.cn4-upgrade" ]; then + mv "$file" "$file.cn4-upgrade" + fi + + rm -f "$file" + done + fi } # make a silent installation of carnet and srce keyrings @@ -476,7 +492,8 @@ upgrade_apache () { squirrelmail-cn; do pkg p && delpkg="$delpkg $p" done - eval pkgrm apache-common $delpkg + eval pkgrm $delpkg + pkgrm apache apache-common # install new packages eval pkgadd apache2-cn apache2-mpm-prefork \