projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Force apache2 and php5 upgrade.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
bba996c
..
2d3df43
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-981,18
+981,17
@@
upgrade_libc () {
DEBIAN_FRONTEND=noninteractive pkgadd libc6 tzdata
}
DEBIAN_FRONTEND=noninteractive pkgadd libc6 tzdata
}
-# upgrade apache2 to etch
+# upgrade apache2 to lenny
upgrade_apache2 () {
local package packages
for package in \
upgrade_apache2 () {
local package packages
for package in \
- libapache2-mod-php4 \
- php4-cli \
- php4-cgi \
- php4-cn \
+ libapache2-mod-php5 \
+ php5-cli \
+ php5-cn \
apache2-cn \
apache2-cn \
- php4-odbc \
- php4-suhosin \
+ php5-odbc \
+ php5-suhosin \
php-suhosin-cn
do
if pkg $package; then
php-suhosin-cn
do
if pkg $package; then
@@
-1000,11
+999,6
@@
upgrade_apache2 () {
fi
done
fi
done
- # enable suhosin downgrade to etch version
- if pkg php4-suhosin; then
- pkgrm php4-suhosin php-suhosin-cn
- fi
-
eval pkgadd $packages
}
eval pkgadd $packages
}