From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Wed, 30 Oct 2013 15:15:02 +0000 (+0100)
Subject: Dont force libc upgrade.
X-Git-Tag: debian/7.0.6~2
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=9923899dc3d2a2472707c5bb87557817b3848a75;p=carnet-upgrade.git

Dont force libc upgrade.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index fc49cf1..c892246 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -23,7 +23,6 @@ true				check_kernel_space
 true				apt_download		# skini pakete
 ! debconf_priority check	debconf_priority set	# utisaj debconf
 pkg monit			disable_monit
-true				upgrade_libc
 true				install_keyrings	# install new keys
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
diff --git a/src/functions.sh b/src/functions.sh
index 1d94faa..d52a0e2 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -861,11 +861,6 @@ pkgupgrade () {
   fi
 }
 
-# make a silent upgrade to new libc6
-upgrade_libc () {
-  DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata
-}
-
 # upgrade apache2/php5
 upgrade_apache2 () {
   pkgrm apache-common # prevents installation of apache2-suexec