From 0983dc3244df7dfb8b1410b3cb85deeb638edaa2 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 7 Oct 2008 00:35:49 +0200 Subject: [PATCH] Fix vnstat directory creation Fix update destroy /etc/init.d -> rc.d/init.d link --- config/rootfiles/core/16/files | 2 +- config/rootfiles/core/17/files | 2 +- config/rootfiles/updater/filelists/files | 2 +- config/rootfiles/updater/update.sh | 1 + src/initscripts/init.d/tmpfs | 6 ++++-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/core/16/files b/config/rootfiles/core/16/files index 49b755948e..0fc2a8f3cd 100644 --- 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 3ccf9c851e..c3454ad7c5 100644 --- 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 97c88d6aa9..2d9f65a4fe 100644 --- 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 1e68f0badc..0f5cf8c873 100755 --- 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 cb60bcd08b..a7ead9d289 100644 --- 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 # -- 2.39.2