From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 4 Oct 2008 08:24:15 +0000 (+0200)
Subject: Fix move/copy of vnstat (beta3->beta4)
X-Git-Tag: v2.3-beta4~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=982f9d55f6076ba24e3255f5db5c84aad82cda6b;p=people%2Fstevee%2Fipfire-2.x.git

Fix move/copy of vnstat (beta3->beta4)
---

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 498eed1dd0..2f01a3273b 100755
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -191,20 +191,20 @@ chown root:cron /var/spool/cron/root.orig
 sed -i 's|"net", SYSFS{address}|"net", SYSFS{type}=="1", SYSFS{address}|g' \
           /etc/udev/rules.d/30-persistent-network.rules
 #
-# Core 17
-#
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-perl /var/ipfire/qos/bin/migrate.pl
-/var/ipfire/updatexlrator/bin/convert
-#
 # Move vnstat database to /var/log/rrd
 #
 mkdir -p /var/log/rrd.bak/vnstat
 if [ -e /var/log/vnstat ]; then
-    cp /var/log/vnstat /var/log/rrd.bak/vnstat
+    cp -pR /var/log/vnstat /var/log/rrd.bak/vnstat
     mv /var/log/vnstat /var/log/rrd/vnstat
 fi
 #
+# Core 17
+#
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl /var/ipfire/qos/bin/migrate.pl
+/var/ipfire/updatexlrator/bin/convert
+#
 # Delete old lm-sensor modullist...
 #
 rm -rf /etc/sysconfig/lm_sensors