X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=blobdiff_plain;f=src%2Ffunctions.sh;h=59cd2af2fb3629198489556d54a8e7f4b8b56a0a;hp=1d05d1cb00e1cc92532dc0212e0338125fe7016b;hb=7a7cf98189a94ee061e88f1807a6d9d11e447ea0;hpb=30276562f0891449dad1600bf910810cd3d581f3

diff --git a/src/functions.sh b/src/functions.sh
index 1d05d1c..59cd2af 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -852,7 +852,7 @@ pkgupgrade () {
 
 # make a silent upgrade to new libc6
 upgrade_libc () {
-  DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata udev
+  DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata
 }
 
 # upgrade apache2/php5
@@ -907,8 +907,8 @@ upgrade_openldap () {
 upgrade_mysql () {
   if pkg mysql-server || pkg mysql-server-5.0; then
      pkgadd mysql-server
-     pkgrm mysql-server-5.0
-     /etc/init.d/mysql start
+     dpkg -P mysql-server-5.0
+     /etc/init.d/mysql restart
   fi
 }
 
@@ -950,6 +950,10 @@ get_variable () {
 upgrade_munin () {
   local config backup hostname domain
 
+  # new htmldir location
+  mkdir -p /var/cache/munin
+  mv /var/www/munin /var/cache/munin/www
+
   for pkg_name in munin munin-node; do
      pkg $pkg_name lt '1.4.5-3' || continue