projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename lenny -> squeeze.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
b1718c4
..
5683139
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-376,7
+376,7
@@
check_upgrade () {
if [ "$upgrade" ]; then
notice "
if [ "$upgrade" ]; then
notice "
-Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju ovih paketa:
+Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju ovih paketa:
$upgrade
Pokrenite:
$upgrade
Pokrenite:
@@
-455,7
+455,7
@@
check_php_version () {
install_php5_extensions
notice "
install_php5_extensions
notice "
-Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju sa PHP 4 na PHP 5.
+Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju sa PHP 4 na PHP 5.
Pokrenite:
# apt-get update
Pokrenite:
# apt-get update
@@
-507,7
+507,7
@@
check_grsec_kernel () {
if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then
# kernel too old
notice "
if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then
# kernel too old
notice "
-Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju na najnoviji kernel.
+Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju na najnoviji kernel.
Pokrenite:
# apt-get update
Pokrenite:
# apt-get update
@@
-600,7
+600,7
@@
upgrade () {
return 1
esac
return 1
esac
- pkgadd_if_installed $packages
+ pkgupgrade $packages
}
# install packages introduced in this release
}
# install packages introduced in this release
@@
-931,7
+931,7
@@
apt_listchanges () {
# make a silent installation of carnet and srce keyrings
install_keyrings () {
pkgadd carnet-keyring srce-keyring debian-archive-keyring
# make a silent installation of carnet and srce keyrings
install_keyrings () {
pkgadd carnet-keyring srce-keyring debian-archive-keyring
- pkgadd_if_installed dpkg apt debconf python-apt dpkg-dev
+ pkgupgrade dpkg apt debconf python-apt dpkg-dev
dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
apt_update
dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
apt_update
@@
-1009,7
+1009,7
@@
grep_installed () {
}
# only upgrade packages if they are already installed
}
# only upgrade packages if they are already installed
-pkgadd_if_installed () {
+pkgupgrade () {
local packages
packages=$( grep_installed $* )
local packages
packages=$( grep_installed $* )
@@
-1021,13
+1021,13
@@
pkgadd_if_installed () {
# make a silent upgrade to new libc6
upgrade_libc () {
# make a silent upgrade to new libc6
upgrade_libc () {
- DEBIAN_FRONTEND=noninteractive pkgadd_if_installed libc6 libc6-dev tzdata
+ DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata
}
}
-# upgrade apache2/php5 to lenny
+# upgrade apache2/php5
upgrade_apache2 () {
pkgrm apache-common # prevents installation of apache2-suexec
upgrade_apache2 () {
pkgrm apache-common # prevents installation of apache2-suexec
- pkgadd_if_installed libapache2-mod-php5 php5-cli php5-cn apache2-cn \
+ pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
php5-odbc php5-suhosin php-suhosin-cn
}
php5-odbc php5-suhosin php-suhosin-cn
}
@@
-1072,7
+1072,7
@@
upgrade_freeradius () {
pkg freeradius-aai lt 2.1.3-0lenny0 || return 0
pkg freeradius-aai lt 2.1.3-0lenny0 || return 0
- # aai team prevents a clean lenny upgrade
+ # aai team prevents a clean upgrade
cp -av /etc/freeradius /etc/freeradius.$backup_ext
pkgrm freeradius-aai freeradius-ldap freeradius
pkgadd freeradius-aai
cp -av /etc/freeradius /etc/freeradius.$backup_ext
pkgrm freeradius-aai freeradius-ldap freeradius
pkgadd freeradius-aai
@@
-1137,6
+1137,13
@@
upgrade_postfix () {
fi
}
fi
}
+# upgrade bind separately so DNS is not down for too long
+# or breaks postinst scripts of other cn packages that depend on
+# working resolver
+upgrade_bind() {
+ pkgadd bind9-cn
+}
+
get_variable () {
local name=$1 file=$2 val
get_variable () {
local name=$1 file=$2 val
@@
-1206,18
+1213,18
@@
comment_force_overwrite () {
# try not to overwrite user modified issue files
fix_issue () {
# try not to overwrite user modified issue files
fix_issue () {
- if cmp /etc/issue $cnup/files/etc/issue.expect.lenny >/dev/null; then
+ if cmp /etc/issue $cnup/files/etc/issue.expect.new >/dev/null; then
cp -av /etc/issue /etc/issue.$backup_ext
cat > /etc/issue <<EOF
cp -av /etc/issue /etc/issue.$backup_ext
cat > /etc/issue <<EOF
-Debian GNU/Linux 5.0 (CARNet Debian 5.0) \\n \\l
+Debian GNU/Linux 6.0 (CARNet Debian 6.0) \\n \\l
EOF
fi
EOF
fi
- if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.lenny >/dev/null; then
+ if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.new >/dev/null; then
cp -av /etc/issue.net /etc/issue.net.$backup_ext
cat > /etc/issue.net <<EOF
cp -av /etc/issue.net /etc/issue.net.$backup_ext
cat > /etc/issue.net <<EOF
-Debian GNU/Linux 5.0 (CARNet Debian 5.0) %h
+Debian GNU/Linux 6.0 (CARNet Debian 6.0) %h
EOF
fi
}
EOF
fi
}