projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mysql upgrade.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
95dd0e3
..
c6dbd85
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-892,6
+892,12
@@
upgrade_freeradius () {
# handle openldap upgrade
upgrade_openldap () {
# handle openldap upgrade
upgrade_openldap () {
+ # aai discovers database type from debconf
+ if [ -f /etc/ldap/slapd.conf ] && grep -q ^database.*bdb /etc/ldap/slapd.conf
+ then
+ echo set slapd/backend BDB | debconf-communicate >/dev/null
+ fi
+
# aai does not depend on the new openldap version
pkgadd slapd
pkgadd openldap-aai
# aai does not depend on the new openldap version
pkgadd slapd
pkgadd openldap-aai
@@
-901,8
+907,8
@@
upgrade_openldap () {
upgrade_mysql () {
if pkg mysql-server || pkg mysql-server-5.0; then
pkgadd mysql-server
upgrade_mysql () {
if pkg mysql-server || pkg mysql-server-5.0; then
pkgadd mysql-server
- pkgrm mysql-server-5.0
- /etc/init.d/mysql start
+ dpkg -P mysql-server-5.0
+ /etc/init.d/mysql restart
fi
}
fi
}