X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=994f765209d707d153c60686021feb6c6382b77b;hb=24ef90a0357f00ca2eeafe398c1de5d55e369509;hp=d783133224dd047528ae0b7574da19dc461b249f;hpb=5d45b0a7ad695a66c522bcd039fddfffdf2cca46;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index d783133..994f765 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -367,7 +367,7 @@ check_upgrade () {
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju ovih paketa:
+Prije prelaska na Debian Wheezy potrebno je napraviti nadogradnju ovih paketa:
   $upgrade
 
 Pokrenite:
@@ -744,6 +744,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
@@ -888,11 +893,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 +1014,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