X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=776c5dd1ab26ff8e54dc84daa5dc37ad6ec4d737;hb=54a4cd434b6478853885e4ef551a66ba2dc8ffea;hp=beccd14e98c893d8cf84daa638de9b0e408ce2f3;hpb=a57a0479c78051fa92ee6ba0b837a511e1c744d8;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index beccd14..776c5dd 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -146,6 +146,12 @@ apt_download() { } dist_upgrade () { + log "Running upgrade ..." + apt-get -y$s upgrade || { + dpkg --configure -a + apt-get -y$s upgrade + } + log "Running dist-upgrade ..." apt-get -y$s dist-upgrade || { dpkg --configure -a @@ -157,7 +163,7 @@ remove_x() { LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75 if [ $? -eq 0 ]; then log "Removing X Window System" - pkgrm xlibs + pkgrm x11-common else log "Skipping X Window System removal" fi @@ -376,7 +382,7 @@ check_upgrade () { if [ "$upgrade" ]; then notice " -Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju ovih paketa: +Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju ovih paketa: $upgrade Pokrenite: @@ -455,7 +461,7 @@ check_php_version () { install_php5_extensions notice " -Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju sa PHP 4 na PHP 5. +Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju sa PHP 4 na PHP 5. Pokrenite: # apt-get update @@ -507,7 +513,7 @@ check_grsec_kernel () { if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then # kernel too old notice " -Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju na najnoviji kernel. +Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju na najnoviji kernel. Pokrenite: # apt-get update @@ -536,23 +542,35 @@ check_reboot () { reboot_required () { local default_kernel kernel_package running_release running_version - # try to get default kernel from lilo - if type lilo >/dev/null 2>&1; then - default_kernel=$( lilo -t -v 2>/dev/null \ - | grep -B3 '[*]$' \ - | sed -n -e '/^Boot image: / { s///p; q; }' ) + # try to get default kernel from grub2 + if [ -z "$default_kernel" -a -r "/boot/grub/grub.cfg" ]; then + default_kernel=$( awk ' + $0 ~ /^set default=".*"/ { + def = gensub(/default="(.*)"/, "\\1", "1", $2); + if (def !~ /^[0-9]+$/) { exit } + } + $1 == "menuentry" { menuentry+=1 } + $1 == "linux" && menuentry==def+1 { print $2; exit }' \ + /boot/grub/grub.cfg 2>/dev/null ) fi - # fallback to grub if lilo not installed + # try to get default kernel from grub-legacy if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then default_kernel=$( awk ' - $1 == "default" { default = $2; - if (default !~ /^[0-9]+$/) { exit } } + $1 == "default" { def = $2; + if (def !~ /^[0-9]+$/) { exit } } $1 == "title" { title+=1 } - $1 == "kernel" && title==default+1 { print $2; exit }' \ + $1 == "kernel" && title==def+1 { print $2; exit }' \ /boot/grub/menu.lst 2>/dev/null ) fi + # try to get default kernel from lilo + if [ -z "$default_kernel" ] && type lilo >/dev/null 2>&1; then + default_kernel=$( lilo -t -v 2>/dev/null \ + | grep -B3 '[*]$' \ + | sed -n -e '/^Boot image: / { s///p; q; }' ) + fi + if [ -z "$default_kernel" ]; then log "Could not find default kernel" return 1 @@ -561,8 +579,12 @@ reboot_required () { log "Default kernel image: $default_kernel" if [ ! -e "$default_kernel" ]; then - log "Default kernel image doesn't exist!?" - return 1 + # /boot prefix might be missing + default_kernel="/boot/${default_kernel#/}" + if [ ! -e "$default_kernel" ]; then + log "Default kernel image doesn't exist!?" + return 1 + fi fi kernel_package=$( dpkg -S $default_kernel | cut -d: -f 1 ) @@ -588,7 +610,7 @@ reboot_required () { } upgrade () { - local i to_install packages + local packages case "$1" in first) packages="$packages_first" @@ -600,15 +622,13 @@ upgrade () { return 1 esac - for i in $(echo $packages) - do - pkg $i && to_install="$to_install $i" - done + pkgupgrade $packages +} - if [ -n "$to_install" ];then - eval pkgadd $to_install - else - return 0 +# install packages introduced in this release +install_new () { + if [ "$new_packages" ]; then + pkgadd $new_packages fi } @@ -800,7 +820,7 @@ copy_template () { # restore modified config to their package defaults # so the upgrade doesn't complain so much restore_configs () { - local hostname domain template config_new + local hostname domain config_new memtotal memlimit # restore simple configs if pkg kernel-2.6-cn && pkg procps lt 1:3.2.7-11; then @@ -863,16 +883,34 @@ restore_configs () { restore_file /etc/issue.net fi + # restore php.ini + memtotal=$(awk '$1 == "MemTotal:" { print int($2/1024) }' /proc/meminfo) + if [ $memtotal -gt 1024 ]; then + memlimit=64 + elif [ $memtotal -ge 512 ]; then + memlimit=32 + else + memlimit=16 + fi + if pkg php5-cn && pkg php5-cli lt 5.2.6.dfsg.1-1+lenny2; then - if restore_file /etc/php5/cli/php.ini; then + config_new=$(copy_template /etc/php5/cli/php.ini) + sed -i "s/^[[:space:]]*memory_limit[[:space:]]*=.*/memory_limit = ${memlimit}M/" $config_new + sed -i "s/^[[:space:]]*post_max_size[[:space:]]*=.*/post_max_size = ${memlimit}M/" $config_new + if restore_file /etc/php5/cli/php.ini $config_new; then postupgrade_reconfigure php5-cn fi + rm -f $config_new fi if pkg php5-cn && pkg libapache2-mod-php5 lt 5.2.6.dfsg.1-1+lenny2; then - if restore_file /etc/php5/apache2/php.ini; then + config_new=$(copy_template /etc/php5/apache2/php.ini) + sed -i "s/^[[:space:]]*memory_limit[[:space:]]*=.*/memory_limit = ${memlimit}M/" $config_new + sed -i "s/^[[:space:]]*post_max_size[[:space:]]*=.*/post_max_size = ${memlimit}M/" $config_new + if restore_file /etc/php5/apache2/php.ini $config_new; then postupgrade_reconfigure php5-cn fi + rm -f $config_new fi # check if monitrc is template based @@ -886,49 +924,6 @@ restore_configs () { restore_file /etc/monit/monitrc $config_new rm -f $config_new fi - -# 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 ntpdate 1:4.2.2 /etc/default/ntpdate -# restore_config oidentd 2.0.8 /etc/default/oidentd -# 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 -# if pkg logcheck-database lt 1.2.54; then -# rm -vf /etc/logcheck/ignore.d.server/imap -# fi -# -# # aide switched to ucf, move old configs aside -# 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.$backup_ext" ]; then -# mv -v "$file" "$file.$backup_ext" -# fi -# -# rm -vf "$file" -# done -# fi -# -# # register cn changes in ucf managed files -# for config in /etc/apache/modules.conf \ -# /etc/clamav/clamd.conf \ -# /etc/clamav/freshclam.conf -# do -# config_backup=$config.$backup_ext -# if [ -e $config -a ! -e $config_backup ]; then -# log "Saving config file $config" -# cp -av $config $config_backup -# ucf $config_backup $config -# fi -# done } # temporary disable listchanges packages to reduce clutter during upgrade @@ -958,7 +953,7 @@ apt_listchanges () { # make a silent installation of carnet and srce keyrings install_keyrings () { pkgadd carnet-keyring srce-keyring debian-archive-keyring - pkgadd dpkg apt debconf python-apt + pkgupgrade dpkg apt debconf python-apt dpkg-dev dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring apt_update @@ -975,9 +970,11 @@ remove_skey () { } # remove unsupported php version +# but leave the configuration just in case remove_php4 () { - # leave the configuration just in case - pkgrm_only php4-common || true + if pkg php5-cn && pkg php4-common; then + pkgrm_only php4-common + fi } # check if package is orphaned (nothing depends on it) @@ -1020,43 +1017,45 @@ disable_monit () { fi } +# check which of the given packages are installed +grep_installed () { + local package installed + + for package in $*; do + if pkg $package; then + installed="$installed $package" + fi + done + + echo $installed +} + +# only upgrade packages if they are already installed +pkgupgrade () { + local packages + + packages=$( grep_installed $* ) + + if [ "$packages" ]; then + eval pkgadd $packages + fi +} + # make a silent upgrade to new libc6 upgrade_libc () { - DEBIAN_FRONTEND=noninteractive pkgadd libc6 tzdata + DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata } -# upgrade apache2 to lenny +# upgrade apache2/php5 upgrade_apache2 () { - local package packages - - for package in \ - libapache2-mod-php5 \ - php5-cli \ - php5-cn \ - apache2-cn \ - php5-odbc \ - php5-suhosin \ - php-suhosin-cn - do - if pkg $package; then - packages="$packages $package" - fi - done - - eval pkgadd $packages + pkgrm apache-common # prevents installation of apache2-suexec + pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \ + php5-odbc php5-suhosin php-suhosin-cn } upgrade_amavis () { local conf - # remove init script diversion before upgrade - if pkg amavisd-cn lt 3:2.6.1-1; then - if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then - rm -vf /etc/init.d/amavis - dpkg-divert --remove /etc/init.d/amavis - fi - fi - # move old config aside for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do if [ -e $conf -a ! -e $conf.$backup_ext ]; then @@ -1067,65 +1066,19 @@ upgrade_amavis () { # install new packages pkgadd amavisd-cn amavisd-new - # fix new packages - check_and_sed '^clamd.*5.clamav.log$' \ - 's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \ - /etc/init.d/amavisd-cn || true - - # check if link got lost - if pkg amavisd-cn && [ ! -L /etc/init.d/amavis ]; then - apt-get install --reinstall --yes amavisd-cn - fi - # start new packages - /etc/init.d/amavis restart + /etc/init.d/amavisd-cn restart } -# handle freerdius config files upgrade +# handle freerdius upgrade upgrade_freeradius () { local template config_new password realm hostname basedn pkg freeradius-aai lt 2.1.3-0lenny0 || return 0 - # handle static configs - restore_file /etc/freeradius/clients.conf - restore_file /etc/freeradius/hints - restore_file /etc/freeradius/ldap.attrmap - - # handle template based configs - basedn=$(sed -n '/^[[:space:]]*suffix[[:space:]]*/ { - s///; s/"//g; p; q }' /etc/ldap/slapd.conf) - hostname=$(hostname -f) - config_new=$(copy_template /etc/freeradius/radiusd.conf) - sed -i "s/#HOSTNAME#/$hostname/" $config_new - sed -i "s/#BASEDN#/$basedn/" $config_new - restore_file /etc/freeradius/radiusd.conf $config_new - rm -f $config_new - - password=$(grep -s '^[[:space:]]*private_key_password[[:space:]]*=' \ - /etc/freeradius/eap.conf) - config_new=$(copy_template /etc/freeradius/eap.conf) - sed -i "s/.*#PASSWORD#.*/$password/" $config_new - restore_file /etc/freeradius/eap.conf $config_new - rm -f $config_new - - realm=$(sed -n '/^[[:space:]]*suffix[[:space:]]*/ { - s///; s/"//g; s/,dc=/./g; s/dc=//; s/.hr$//; p; q }' /etc/ldap/slapd.conf) - config_new=$(copy_template /etc/freeradius/proxy.conf) - sed -i "s/#REALM#/$realm/" $config_new - restore_file /etc/freeradius/proxy.conf $config_new - rm -f $config_new - - # install the new packages - if ! apt-get -y install freeradius; then - # freeradius upgrade fails here, try to fix it by creating certificates - [ -x /etc/freeradius/certs/bootstrap ] && /etc/freeradius/certs/bootstrap - - dpkg --configure -a - apt-get -y -f install - fi - - # finally try to cleanup this mess + # aai team prevents a clean upgrade + cp -av /etc/freeradius /etc/freeradius.$backup_ext + pkgrm freeradius-aai freeradius-ldap freeradius pkgadd freeradius-aai } @@ -1188,6 +1141,13 @@ upgrade_postfix () { fi } +# upgrade bind separately so DNS is not down for too long +# or breaks postinst scripts of other cn packages that depend on +# working resolver +upgrade_bind() { + pkgadd bind9-cn +} + get_variable () { local name=$1 file=$2 val @@ -1199,38 +1159,6 @@ get_variable () { echo $val } -# preserve mail location on upgrade -upgrade_dovecot () { - local default_mail_env mail_location - - # check if already upgraded - if ! pkg dovecot-common lt 1.0; then - return - fi - - # save old mail location - default_mail_env=$(get_variable default_mail_env /etc/dovecot/dovecot.conf) - - # silently upgrade package - restore_file /etc/dovecot/dovecot.conf - pkgadd dovecot-cn - - # insert old mail location - mail_location=$(get_variable mail_location /etc/dovecot/dovecot.conf) - if [ "$default_mail_env" -a ! "$mail_location" ]; then - check_and_sed '^#mail_location[[:space:]]*=' \ - "s|#mail_location[[:space:]]*=.*|mail_location = $default_mail_env|" /etc/dovecot/dovecot.conf || return 0 - - if [ -x /etc/init.d/dovecot ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - /usr/sbin/invoke-rc.d dovecot restart - else - /etc/init.d/dovecot restart - fi - fi - fi -} - # restore munin configs for silent upgrade upgrade_munin () { local config backup hostname domain @@ -1287,15 +1215,22 @@ comment_force_overwrite () { fi } +# try not to overwrite user modified issue files fix_issue () { - cat > /etc/issue </dev/null; then + cp -av /etc/issue /etc/issue.$backup_ext + cat > /etc/issue < /etc/issue.net </dev/null; then + cp -av /etc/issue.net /etc/issue.net.$backup_ext + cat > /etc/issue.net <