X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fcn-upgrade;h=b880f8bc3fc5da676c0c9bc72f59bd30cfe11930;hb=9cca6edc89d02bb8820c4cb1b65707c38dab8758;hp=c5f5e40c2b231a68984d2c1ebc7d239f2c1494b1;hpb=1df8665eaf2d0877f37d3a9f444a914e00e5c594;p=carnet-upgrade.git

diff --git a/src/cn-upgrade b/src/cn-upgrade
index c5f5e40..b880f8b 100755
--- 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
-    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
@@ -25,9 +25,9 @@ fi
 
 cnup="/usr/share/carnet-upgrade"
 
+. ${ROOT}${cnup}/data.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"