X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=4c9860867856ab4f531d29f58de8fa28d735d20b;hb=2a7b2e0a1cfbe09be91af61f2938199a4b6591e9;hp=780c3b89141f0dde3cabb53cc0ddf30c3c72015d;hpb=f6785cff750ed6ee9091b4ae515abf8c0aae3abf;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index 780c3b8..4c98608 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -367,7 +367,7 @@ check_upgrade () { if [ "$upgrade" ]; then notice " -Prije prelaska na Debian Wheezy potrebno je napraviti nadogradnju ovih paketa: +Prije prelaska na Debian jessie potrebno je napraviti nadogradnju ovih paketa: $upgrade Pokrenite: @@ -530,16 +530,18 @@ create_sources_list () { # backup old version if [ -f $sl -a ! -f $sl.$backup_ext ]; then - cp -av $sl $sl.$backup_ext + cp -v $sl $sl.$backup_ext fi # install new version - cp -av $sl_new $sl + cp -v $sl_new $sl notice "Novi sadrzaj datoteke /etc/apt/sources.list: `cat /etc/apt/sources.list`" fi + # make sure permissions are correct + chmod 0644 $sl rm $sl_new } @@ -744,6 +746,11 @@ restore_configs () { fi } +# load various debconf defaults +debconf_preload () { + echo libc6 libraries/restart-without-asking boolean true | debconf-set-selections +} + # temporary disable listchanges packages to reduce clutter during upgrade apt_listchanges () { local file command=$1 @@ -864,7 +871,6 @@ pkgupgrade () { # upgrade apache2/php5 upgrade_apache2 () { pkgrm apache-common # prevents installation of apache2-suexec - pkgrm php5-suhosin # not available for wheezy pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \ php5-odbc mod-security-cn } @@ -888,11 +894,6 @@ upgrade_amavis () { # handle mysql 5.0 to 5.1 upgrade upgrade_mysql () { - # libc6-dev prevents mysql upgrade - if pkg libc6-dev; then - pkgrm libc6-dev - fi - if pkg mysql-server || pkg mysql-server-5.1; then pkgadd mysql-server dpkg -P mysql-server-5.1 @@ -1014,6 +1015,17 @@ get_variable () { echo $val } +# switch to rsyslog +upgrade_syslog() { + # libc6-dev prevents upgrade + if pkg libc6-dev; then + pkgrm libc6-dev + fi + + pkgadd rsyslog + dpkg -P sysklogd klogd +} + # restore munin configs for silent upgrade upgrade_munin () { local config backup hostname domain