Fix vnstat directory creation

Fix update destroy /etc/init.d -> rc.d/init.d link

diff --git a/config/rootfiles/core/16/files b/config/rootfiles/core/16/files
index 49b755948e11e1f032e14944286dd73117c3f9d4..0fc2a8f3cd061804f83108ba32436607ab3ac841 100644 (file)
--- a/config/rootfiles/core/16/files
+++ b/config/rootfiles/core/16/files
@@ -1,4 +1,4 @@
-etc/init.d/squid
+etc/rc.d/init.d/squid
 etc/ppp/ip-up
 var/ipfire/outgoing/bin/outgoingfw.pl
 var/ipfire/urlfilter/autoupdate/autoupdate.urls

diff --git a/config/rootfiles/core/17/files b/config/rootfiles/core/17/files
index 3ccf9c851e7d48c6f72d5d45383a473305cf2741..c3454ad7c5df380020ce24bb032fe73fe05d4dde 100644 (file)
--- a/config/rootfiles/core/17/files
+++ b/config/rootfiles/core/17/files
@@ -1,5 +1,5 @@
 etc/squid
-etc/init.d/connectd
+etc/rc.d/init.d/connectd
 opt/pakfire/lib/functions.sh
 opt/pakfire/lib/functions.pl
 usr/lib/squid/

diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files
index 97c88d6aa9286b2e995ba3ebd60e1d26f5a98a66..2d9f65a4fe1a868e0d47d071e27797f741987086 100644 (file)
--- a/config/rootfiles/updater/filelists/files
+++ b/config/rootfiles/updater/filelists/files
@@ -1,5 +1,5 @@
 opt/pakfire/db/core/mine
-etc/init.d/mISDN
+etc/rc.d/init.d/mISDN
 etc/modprobe.d/blacklist
 usr/bin/bc
 usr/bin/dc

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 1e68f0badcc1d7584947e7a5086d847430a3b778..0f5cf8c873feeb2700ca38ff6cd608021c8d5de4 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -196,6 +196,7 @@ sed -i 's|"net", SYSFS{address}|"net", SYSFS{type}=="1", SYSFS{address}|g' \
 # Move vnstat database to /var/log/rrd
 #
 mkdir -p /var/log/rrd.bak/vnstat
+mkdir -p /var/log/rrd/vnstat
 if [ -e /var/log/vnstat ]; then
     cp -pR /var/log/vnstat /var/log/rrd.bak/vnstat
     mv /var/log/vnstat /var/log/rrd/vnstat

diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index cb60bcd08b5ab880333426d7a70817337e57bc87..a7ead9d289ddda52a77ea7022319934cc869113e 100644 (file)
--- a/src/initscripts/init.d/tmpfs
+++ b/src/initscripts/init.d/tmpfs
@@ -15,8 +15,10 @@ case "$1" in
                $0 restore
                if [ ! -e $RRDLOG.bak/vnstat ]; then
                        mkdir -p $RRDLOG.bak/vnstat
-               fi
-
+               fi
+               if [ ! -e $RRDLOG/vnstat ]; then
+                       mkdir -p $RRDLOG/vnstat
+               fi
                #
                # create some folders
                #