projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added vsftpd upgrade function.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
22ba7a6
..
9d35ceb
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-229,8
+229,8
@@
run_actions() {
check=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $1}')
action=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $2}')
checkmsg=""
check=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $1}')
action=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $2}')
checkmsg=""
- [ "$test" != "true" ] && checkmsg="if '$test'"
- if eval $test; then
+ [ "$check" != "true" ] && checkmsg="if '$check'"
+ if eval $check; then
log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg "
eval $action
log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg "
eval $action
log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
@@
-539,6
+539,7
@@
restore_configs () {
do
config_backup=$config.$backup_ext
if [ -e $config -a ! -e $config_backup ]; then
do
config_backup=$config.$backup_ext
if [ -e $config -a ! -e $config_backup ]; then
+ log "Saving config file $config"
cp -av $config $config_backup
ucf $config_backup $config
fi
cp -av $config $config_backup
ucf $config_backup $config
fi
@@
-706,6
+707,16
@@
upgrade_dovecot () {
fi
}
fi
}
+# vsftpd.postinst tries to start vsftpd so make sure it is not running
+upgrade_vsftpd () {
+ if [ -x /etc/init.d/vsftpd ]; then
+ /etc/init.d/vsftpd stop || true
+ fi
+
+ pkg vsftpd && pkgadd vsftpd
+ pkg vsftpd-cn && pkgadd vsftpd-cn
+}
+
# fix /etc/dpkg/dpkg.cfg
comment_force_overwrite () {
if [ -f /etc/dpkg/dpkg.cfg ]; then
# fix /etc/dpkg/dpkg.cfg
comment_force_overwrite () {
if [ -f /etc/dpkg/dpkg.cfg ]; then