projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for slapd postinst failure.
[carnet-upgrade.git]
/
src
/
cn-upgrade
diff --git
a/src/cn-upgrade
b/src/cn-upgrade
index
c5f5e40
..
b880f8b
100755
(executable)
--- a/
src/cn-upgrade
+++ b/
src/cn-upgrade
@@
-8,8
+8,8
@@
version="carnet-upgrade v4.0.0"
if [ "$1" == "--no-script" ]; then
shift
elif [ -x /usr/bin/script ]; then
if [ "$1" == "--no-script" ]; then
shift
elif [ -x /usr/bin/script ]; then
- exec /usr/bin/script -a -c "$0 --no-script $@" \
- /var/log/carnet-upgrade.typescript
+ exec /usr/bin/script -a -t -f -c "$0 --no-script $@" \
+ /var/log/carnet-upgrade.typescript 2>>/var/log/carnet-upgrade.timing
fi
set -e
fi
set -e
@@
-25,9
+25,9
@@
fi
cnup="/usr/share/carnet-upgrade"
cnup="/usr/share/carnet-upgrade"
+. ${ROOT}${cnup}/data.sh
. ${ROOT}${cnup}/messages.sh
. ${ROOT}${cnup}/functions.sh
. ${ROOT}${cnup}/messages.sh
. ${ROOT}${cnup}/functions.sh
-. ${ROOT}${cnup}/data.sh
main_queuetab="${cnup}/actions/main.queue"
post_upgrade_queuetab="/var/lib/carnet-upgrade/post_upgrade.queue"
main_queuetab="${cnup}/actions/main.queue"
post_upgrade_queuetab="/var/lib/carnet-upgrade/post_upgrade.queue"