X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=c51c2d29d150cd62332c9b421c4b53ef8779bf5d;hb=2373fadf91162cd602cbb0d0ad425f98809ac19a;hp=1d83c80be1a0348098072d24ce40d3438d432e43;hpb=ef77c3319e1d5234b7e0a4974c8401bbf8039ec9;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index 1d83c80..c51c2d2 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -2,11 +2,15 @@ # Zoran 'jelly' Dzelajlija notice () { - dialog --backtitle "$title" --msgbox "$*" 18 75 + LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75 } first_warning () { - dialog --backtitle "$title" --yesno "$msg_first_warning" 18 75 + LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_first_warning" 18 75 + if [ $? -ne 0 ]; then + log "Upgrade canceled." + exit 0 + fi } pkg() { @@ -101,7 +105,7 @@ pkgadd () { pkgrm () { [ -n "$*" ] || return 0 - log "Removing $* ..." + log "Purging $* ..." apt-get -y$s --purge remove $* || { dpkg --configure -a apt-get -yf install @@ -109,13 +113,28 @@ pkgrm () { } } -update() { +pkgrm_only () { + [ -n "$*" ] || return 0 + log "Removing $* ..." + apt-get -y$s remove $* || { + dpkg --configure -a + apt-get -yf install + apt-get -y$s remove $* + } +} + + +apt_update() { log "Running apt-get update ..." apt-get -y$s update || { apt-get -yf install apt-get -y$s update } apt-get autoclean +} + +apt_download() { + log "Running apt-get download ..." apt-get -dy$s dist-upgrade } @@ -127,6 +146,16 @@ dist_upgrade () { } } +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 + else + log "Skipping X Window System removal" + fi +} + remove_bloat() { local to_remove add_this i j n text to_show cmd tmpfile installed local update_selections pkgs_to_deselect pkgs_to_remove oldifs pkglist @@ -151,7 +180,7 @@ remove_bloat() { [ -z "$to_show" ] && return 0 test $n -gt 8 && n=8 tmpfile=$(mktemp /var/lib/carnet-upgrade/dialog-tmp.XXXXXX) - cmd="dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 $n $to_show" + cmd="LC_MESSAGES=hr_HR dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 $n $to_show" [ "$DEBUG" ] && set +x eval $cmd 2> $tmpfile [ "$DEBUG" ] && set -x @@ -184,6 +213,57 @@ remove_bloat() { eval pkgrm $pkgs_to_remove } +remove_cn_bloat() { + local installed pkg cn_pkgs dialog_list selection cn_del to_del del_pkgs + + # get installed packages + installed=$(mktemp /var/lib/carnet-upgrade/pkglist.XXXXXX) + COLUMNS=200 dpkg -l | awk '$1 ~ /^.i/ { print $2 }' >$installed + + # detect installed CN packagees + for pkg in $(echo "$cn_bloats" | cut -d' ' -f1); do + if grep -qx $pkg $installed; then + cn_pkgs="$cn_pkgs $pkg" + dialog_list="$dialog_list $pkg '' off" + fi + done + rm -f $installed + + # report status or finish if no CN packages found + if [ "$cn_pkgs" ]; then + log "Found CN packages:$cn_pkgs" + else + log "No CN packages found." + return + fi + + # user selects the packages to delete + selection=$(mktemp /var/lib/carnet-upgrade/selection.XXXXXX) + eval LC_MESSAGES=hr_HR dialog --nocancel --backtitle \""$title"\" \ + --checklist \""$msg_remove_cn_bloat"\" 20 75 6 $dialog_list 2>$selection + + # expand the package list to include the services + for pkg in $(cat $selection); do + pkg=${pkg%\"} + pkg=${pkg#\"} + cn_del="$cn_del $pkg" + to_del=$(echo "$cn_bloats" | grep ^$pkg) + del_pkgs="$del_pkgs $to_del" + done + rm -f $selection + + # report selection or finish if no service selected + if [ "$cn_del" ]; then + log "Removing CN services:$cn_del" + else + log "No CN services selected for removal." + return + fi + + # delete the cn packages and relevant services + pkgrm_only $del_pkgs +} + post_upgrade() { touch "$post_upgrade_queuetab" if ! grep -q "true $*" "$post_upgrade_queuetab"; then @@ -231,8 +311,13 @@ run_actions() { [ "$check" != "true" ] && checkmsg="if '$check'" if eval $check; then log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg " - eval $action - log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg" + if ! eval $action; then + log "$(printf 'action %02d' $lineno) failed: '${action}' $checkmsg " + display_action_failure "$action" + exit 1 + else + log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg" + fi else log "$(printf 'action %02d' $lineno) skipping: '${action}' $checkmsg" fi @@ -242,6 +327,24 @@ run_actions() { log "-----" } +# report action failure +display_action_failure () { + local action=$1 + + notice " +Doslo je do greske prilikom izvrsavanja akcije '$action'. Detalje problema moguce je vidjeti u log datotekama: + + /var/log/carnet-upgrade.log + /var/log/carnet-upgrade.typescript + +Da bi dovrsili zapocete operacije nad paketima pokrenite: + + # dpkg --configure -a + # apt-get -f install + +Nakon toga ponovno pozovite carnet-upgrade skriptu." +} + # funkcija vraca popis paketa koje treba upgradeati what_upgrade () { local IFSOLD name version package @@ -262,11 +365,11 @@ what_upgrade () { # funkcija za ispis paketa koje treba upgradeati check_upgrade () { local upgrade - upgrade="`what_upgrade`" + upgrade=${1:-"`what_upgrade`"} if [ "$upgrade" ]; then notice " -Prije prelaska na Debian Etch potrebno je napraviti nadogradnju ovih paketa: +Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju ovih paketa: $upgrade Pokrenite: @@ -282,12 +385,67 @@ Nakon toga ponovno pozovite ovu skriptu." fi } +# update sarge urls in sources list +fix_sarge_sources () { + local apt_sources='/etc/apt/sources.list' + local fixed_sources=$(mktemp /var/lib/carnet-upgrade/sources.list.XXXXXX) + + # sarge (oldstable) was archived recently -> sources.list needs update + awk -v archive='http://archive.debian.org/debian' \ + -v security='http://archive.debian.org/debian-security' \ + '$3 == "sarge" && $2 ~ /[/]debian$/ { $2 = archive } + $3 == "sarge/updates" && $2 ~ /security\.debian\.org$/ { $2 = security } + { print }' $apt_sources > $fixed_sources + + # did anything get updated + if ! cmp $apt_sources $fixed_sources >/dev/null; then + log "sources.list fixed to use archive.debian.org" + + # backup current version + if [ ! -f "$apt_sources.$backup_ext.sarge" ]; then + cp -av $apt_sources "$apt_sources.$backup_ext.sarge" + fi + + # install fixed version + cp -av $fixed_sources $apt_sources + + # update the database + apt_update + fi + + # delete temporary + rm -f $fixed_sources +} + +# try to check if we are using the latest version of carnet-upgrade script +check_my_version () { + local packages latest_version + + packages=$(mktemp /var/lib/carnet-upgrade/Packages.XXXXXX) + if wget -q -O$packages $packages_uri; then + latest_version=$(sed -ne \ + '/Package: carnet-upgrade/,/Description:/{ /Version: /s///p }' \ + $packages) + rm -f $packages + + if [ "$latest_version" ]; then + log "Running carnet-upgrade version is $version" + log "Latest carnet-upgrade version is $latest_version" + if dpkg --compare-versions "$version" lt "$latest_version"; then + check_upgrade " carnet-upgrade" + else log "Already using the latest carnet-upgrade version."; fi + else log "Failed to get latest version, skipping check."; fi + else log "Failed to download Packages file, skipping check."; fi + + rm -f $packages +} + # if apache is installed make sure it's version 2 check_apache_version () { if pkg apache-cn && ! pkg apache2-cn; then notice " -Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0. +Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0. Pokrenite: # apt-get update @@ -299,6 +457,79 @@ Nakon toga ponovno pozovite ovu skriptu." fi } +# if grsec is installed make sure it is fresh +check_grsec_kernel () { + local ver=`uname -r` + + log "Kernel version: $ver" + if [ "$ver" = "${ver%-grsec}" ]; then + # not grsec variant + return 0 + fi + + if [ "$ver" = "${ver#2.6.2[4-9]}" ] || reboot_required; then + # kernel too old + notice " +Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju na najnoviji kernel. + +Pokrenite: + # apt-get update + # apt-get install kernel-2.6-cn + # reboot + +Nakon toga ponovno pozovite ovu skriptu." + log "carnet-upgrade aborted, kernel upgrade needed." + exit 1 + fi +} + +# check if the latest kernel is booted +reboot_required () { + local default_kernel kernel_package running_release running_version + + default_kernel=$( lilo -t -v 2>/dev/null \ + | grep -B3 '[*]$' \ + | sed -n -e '/^Boot image: / { s///p; q; }' ) + + if [ -z "$default_kernel" ]; then + log "Could not find default kernel" + return 1 + fi + + log "Default kernel image: $default_kernel" + + if [ ! -e "$default_kernel" ]; then + log "Default kernel image doesn't exist!?" + return 1 + fi + + kernel_package=$( dpkg -S $default_kernel | cut -d: -f 1 ) + + if [ -z "$kernel_package" ]; then + log "Default kernel not installed from a package" + return 1 + fi + + log "Default kernel package: $kernel_package" + + if [ "$kernel_package" != "kernel-2.6-cn" ]; then + log "Default kernel package is not kernel-2.6-cn" + return 1 + fi + + running_release=$( uname -r ) + running_version=$( uname -v ) + log "Running kernel: $running_release $running_version" + + if grep -q "$running_release .* $running_version" $default_kernel; then + log "Latest kernel version is running." + return 1 + else + log "Reboot to latest version required." + return 0 + fi +} + upgrade () { local i to_install packages case "$1" in @@ -573,7 +804,7 @@ install_keyrings () { pkgadd dpkg apt debconf python-apt dpkg-reconfigure carnet-keyring srce-keyring - update + apt_update } # remove skey (not supported anymore) @@ -611,10 +842,6 @@ upgrade_libc () { upgrade_apache2 () { local package packages - # php-suhosin-cn causes removal of applications on dist-upgrade - # because of php5 only dependencies - pkgrm php-suhosin-cn - for package in \ libapache2-mod-php4 \ php4-cli \ @@ -622,32 +849,39 @@ upgrade_apache2 () { php4-cn \ apache2-cn \ php4-odbc \ - php4-suhosin + php4-suhosin \ + php-suhosin-cn do if pkg $package; then packages="$packages $package" fi done - for package in $(echo $packages); do - pkgadd $package - done + # enable suhosin downgrade to etch version + if pkg php4-suhosin; then + pkgrm php4-suhosin php-suhosin-cn + fi + + eval pkgadd $packages } upgrade_amavis () { local conf - # remove init script diversion - if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then - rm -vf /etc/init.d/amavis - dpkg-divert --quiet --remove /etc/init.d/amavis + # remove init script diversion before upgrade + if pkg amavisd-cn lt 3:2.4.2-4; 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 - conf=/etc/amavis/amavisd.conf - if [ -e $conf -a ! -e $conf.$backup_ext ]; then - mv -v $conf $conf.$backup_ext - fi + for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do + if [ -e $conf -a ! -e $conf.$backup_ext ]; then + mv -v $conf $conf.$backup_ext + fi + done # install new packages pkgadd amavisd-cn amavisd-new @@ -657,6 +891,11 @@ upgrade_amavis () { '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 } @@ -769,20 +1008,129 @@ comment_force_overwrite () { fix_issue () { cat > /etc/issue < /etc/issue.net <