X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=a0431a40c19c170b52a00bf6a393cdff0cd3c5a8;hb=bad9c16de7e4b3dd5833aab89c682bfddc730bdc;hp=ce861a3139b0a88dd518ea1e28993f6ca4060946;hpb=0ded29d74f100f20d8aab848d69eb17d9a68ee40;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index ce861a3..a0431a4 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -201,6 +201,7 @@ remove_bloat() { fi done done + IFS="$oldifs" [ "$DEBUG" ] && echo "DEBUG: pkgs_to_remove=$pkgs_to_remove" 1>&2 # Finally, remove those if [ -n "$update_selections" ]; then @@ -927,7 +928,7 @@ upgrade_amavis () { upgrade_freeradius () { local password - pkg freeradius-aai lt 2.1.10-1 || return 0 + pkg freeradius-aai lt 2.1.12~srce1 || return 0 # aai team prevents a normal upgrade cp -av /etc/freeradius /etc/freeradius.$backup_ext @@ -952,9 +953,9 @@ upgrade_freeradius () { # handle mysql 5.0 to 5.1 upgrade upgrade_mysql () { - if pkg mysql-server || pkg mysql-server-5.0; then + if pkg mysql-server || pkg mysql-server-5.1; then pkgadd mysql-server - dpkg -P mysql-server-5.0 + dpkg -P mysql-server-5.1 /etc/init.d/mysql restart fi }