projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Double check rsyslog installation.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
c075a88
..
56fab41
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-888,11
+888,6
@@
upgrade_amavis () {
# handle mysql 5.0 to 5.1 upgrade
upgrade_mysql () {
# handle mysql 5.0 to 5.1 upgrade
upgrade_mysql () {
- # libc6-dev prevents mysql upgrade
- if pkg libc6-dev; then
- pkgrm libc6-dev
- fi
-
if pkg mysql-server || pkg mysql-server-5.1; then
pkgadd mysql-server
dpkg -P mysql-server-5.1
if pkg mysql-server || pkg mysql-server-5.1; then
pkgadd mysql-server
dpkg -P mysql-server-5.1
@@
-1016,6
+1011,11
@@
get_variable () {
# switch to rsyslog
upgrade_syslog() {
# switch to rsyslog
upgrade_syslog() {
+ # libc6-dev prevents upgrade
+ if pkg libc6-dev; then
+ pkgrm libc6-dev
+ fi
+
pkgadd rsyslog
dpkg -P sysklogd klogd
}
pkgadd rsyslog
dpkg -P sysklogd klogd
}