From 8d24fff558034de33646c2ab3a4d9954fc55c107 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Thu, 2 Jul 2009 10:45:58 +0200 Subject: [PATCH] Install ocsinventory-agent-cn. --- debian/changelog | 6 ++++++ src/actions/main.queue | 1 + src/actions/post_upgrade.queue | 2 +- src/data.sh | 5 +++++ src/functions.sh | 7 +++++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ce69429..c3b0861 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +carnet-upgrade (5.0.1) stable; urgency=low + + * Install packages introduced in this release. + + -- Valentin Vidic Thu, 02 Jul 2009 09:54:36 +0200 + carnet-upgrade (5.0.0) stable; urgency=low * Etch->Lenny version of upgrade scripts. diff --git a/src/actions/main.queue b/src/actions/main.queue index 4dac0a7..11160b0 100644 --- a/src/actions/main.queue +++ b/src/actions/main.queue @@ -47,6 +47,7 @@ true upgrade first # neki paketi moraju rucno true upgrade second # neke pakete zelimo ranije true remove_orphaned # ocisti stare libove nakon sto su cn paketi nadogradjeni true dist_upgrade # instaliraj ostatak +true install_new # instaliraj nove # i ostatak true add_group_proc # za oidentd true pkgadd monit-cn diff --git a/src/actions/post_upgrade.queue b/src/actions/post_upgrade.queue index f7d8518..695ea4e 100644 --- a/src/actions/post_upgrade.queue +++ b/src/actions/post_upgrade.queue @@ -4,9 +4,9 @@ # dodavati naknadne instalacije/upgrade paketa koje mozda nisu upgradeane sa # 2.1-1, tj. nije ih bilo u packages_first popisu a dist-upgrade ih nije # instalirao. To se mozda odnosi na ntp-cn, pa je za svaki slucaj dodan. - true debconf_priority reset true add_group_proc # + restart oidentd ako treba +true install_new pkg kernel-2.6-cn dpkg-reconfigure kernel-2.6-cn # ovo bi trebalo biti predzadnje na popisu # - izvrsi sve uvjetne post_upgrade akcije diff --git a/src/data.sh b/src/data.sh index a91325d..cc9189c 100644 --- a/src/data.sh +++ b/src/data.sh @@ -118,6 +118,11 @@ libsnmp9 libsensors3 ' +# new packages to be installed +new_packages=' +ocsinventory-agent-cn +' + # Check if these services are running after upgrade # package-cn user proces (pazi, regexp) nice name services_to_check=' diff --git a/src/functions.sh b/src/functions.sh index c5156e6..ecac67b 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -603,6 +603,13 @@ upgrade () { pkgadd_if_installed $packages } +# install packages introduced in this release +install_new () { + if [ "$new_packages" ]; then + pkgadd $new_packages + fi +} + # funkcija utrpa ispravan sources.list create_sources_list () { local sl sl_new -- 1.7.10.4