From 644358dc5f855d3829ba97d23a3c4d556f0b304d Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Thu, 27 Mar 2008 17:12:36 +0100 Subject: [PATCH] Reverted postgresql upgrade function. Fixed parameter word splitting. Fixed removal of apt-listchanges. Minor documentation update. --- doc/carnet-upgrade.sgml | 13 ++++++------- src/cn-upgrade | 2 +- src/data.sh | 4 ++-- src/functions.sh | 17 ++++++++++------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/doc/carnet-upgrade.sgml b/doc/carnet-upgrade.sgml index 48b487a..082e37d 100644 --- a/doc/carnet-upgrade.sgml +++ b/doc/carnet-upgrade.sgml @@ -230,12 +230,11 @@ deb http://ftp.carnet.hr/carnet-debian sarge main non-free | sa Apache 1.3 na Apache 2.0. | | | | Pokrenite: | -| 'apt-get install apache2-cn' | +| # apt-get update | +| # apt-get install apache2-cn | | | | Nakon toga ponovno pozovite ovu skriptu. | | | -| | -| | +-----------------------------------------------------------------+ | < OK > | +-----------------------------------------------------------------+ @@ -258,14 +257,14 @@ deb http://ftp.carnet.hr/carnet-debian sarge main non-free | amavisd-cn | | | | Pokrenite: | -| 'apt-get dist-upgrade' | +| # apt-get update | +| # apt-get dist-upgrade | | ili: | -| 'apt-get install amavisd-cn' | +| # apt-get update | +| # apt-get install amavisd-cn | | | | Nakon toga ponovno pozovite ovu skriptu. | | | -| | -| | +-----------------------------------------------------------------+ | < OK > | +-----------------------------------------------------------------+ diff --git a/src/cn-upgrade b/src/cn-upgrade index b880f8b..eb473dc 100755 --- a/src/cn-upgrade +++ b/src/cn-upgrade @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # last update: 2005-01-07 # Zoran 'jelly' Dzelajlija # Ivan 'ico' Rako diff --git a/src/data.sh b/src/data.sh index b771acb..916c9bc 100644 --- a/src/data.sh +++ b/src/data.sh @@ -39,7 +39,7 @@ xinetd-cn 2:2.3.13-1 # Packages to forcibly install before installing the rest with dist-upgrade, # because dist-upgrade would rather remove or keep them back them. packages_first=' -libkrb5-17-heimdal postgresql-client unixodbc +libkrb5-17-heimdal postgresql-client unixodbc iptables ' # Packages that provide crucial services, upgrade them before the rest @@ -79,7 +79,7 @@ gobjc gpc gcj gij chill g77 gcc-2.95-cn gcc-cn gcc-misc-cn gobjc gpc gcj gij ch nessus libnessus2 nessus-cn prelude piwi piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn snort snort snort-cn snort-central-cn -stari CN paketi autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn jre-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn postgresql-cn procmail-cn python-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn tcpdump-cn unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn +stari CN paketi autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn jre-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn procmail-cn python-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn tcpdump-cn unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn ' # Check if these services are running after upgrade diff --git a/src/functions.sh b/src/functions.sh index 2b6d3a0..9c81fc8 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -271,9 +271,11 @@ Prije prelaska na Debian Etch potrebno je napraviti nadogradnju ovih paketa: $upgrade Pokrenite: - 'apt-get dist-upgrade' + # apt-get update + # apt-get dist-upgrade ili: - 'apt-get install${upgrade}' + # apt-get update + # apt-get install${upgrade} Nakon toga ponovno pozovite ovu skriptu." log "carnet-upgrade aborted, upgrade of$upgrade needed." @@ -289,7 +291,8 @@ check_apache_version () { Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0. Pokrenite: - 'apt-get install apache2-cn' + # apt-get update + # apt-get install apache2-cn Nakon toga ponovno pozovite ovu skriptu." log "carnet-upgrade aborted, upgrade to apache2-cn needed." @@ -310,7 +313,7 @@ upgrade () { return 1 esac - for i in $packages + for i in $(echo $packages) do pkg $i && to_install="$to_install $i" done @@ -573,7 +576,7 @@ apt_listchanges () { # make a silent installation of carnet and srce keyrings install_keyrings () { pkgadd carnet-keyring srce-keyring - pkgadd dpkg apt debconf + pkgadd dpkg apt debconf python-apt dpkg-reconfigure carnet-keyring srce-keyring update @@ -616,7 +619,7 @@ upgrade_apache2 () { fi done - for package in $packages; do + for package in $(echo $packages); do pkgadd $package done } @@ -669,7 +672,7 @@ upgrade_openldap () { # fix postgresql deinstallation during upgrade upgrade_postgresql () { if check_services show 2>&1 | grep -qw postgresql; then - pkgadd postgresql + apt-get install -y postgresql || apt-get -yf install fi } -- 1.7.10.4