From dd7d74eb65b96a3fe0a664cf14b7185a10c6f7f2 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 3 Oct 2008 11:15:51 +0200
Subject: [PATCH] Updater create addon backup folder if it was missing made
 some folders in /var/run at boot move /var/spool/cron to ramdisk and link to
 it add the ramdisk default folder to makegraphs

---
 config/rootfiles/updater/update.sh | 12 ++++++++--
 src/initscripts/init.d/tmpfs       | 36 ++++++++++++++++++++++++++++++
 src/scripts/makegraphs             |  5 +++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index dd9eadfb6b..498eed1dd0 100755
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -68,6 +68,12 @@ tar czvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
 echo
 echo Update IPfire to $NEWVERSION ...
 #
+# On some systems the folder for addon backups is missing
+#
+if [ ! -e /var/ipfire/backup/addons/backup ]; then
+    mkdir -p /var/ipfire/backup/addons/backup
+fi
+#
 # Delete old collectd symlink
 #
 rm -rf /etc/rc.d/rc3.d/S20collectd
@@ -194,8 +200,10 @@ perl /var/ipfire/qos/bin/migrate.pl
 # Move vnstat database to /var/log/rrd
 #
 mkdir -p /var/log/rrd.bak/vnstat
-cp /var/log/vnstat /var/log/rrd.bak/vnstat
-mv /var/log/vnstat /var/log/rrd/vnstat
+if [ -e /var/log/vnstat ]; then
+    cp /var/log/vnstat /var/log/rrd.bak/vnstat
+    mv /var/log/vnstat /var/log/rrd/vnstat
+fi
 #
 # Delete old lm-sensor modullist...
 #
diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index d274176286..cb60bcd08b 100644
--- a/src/initscripts/init.d/tmpfs
+++ b/src/initscripts/init.d/tmpfs
@@ -16,6 +16,42 @@ case "$1" in
 		if [ ! -e $RRDLOG.bak/vnstat ]; then
 			mkdir -p $RRDLOG.bak/vnstat
 		fi
+
+		#
+		# create some folders
+		#
+		if [ ! -e /var/run/clamav ]; then
+			mkdir -p /var/run/clamav
+			chown clamav:clamav /var/run/clamav
+		fi
+		if [ ! -e /var/run/cups ]; then
+			mkdir -p /var/run/cups
+		fi
+		if [ ! -e /var/run/dbus ]; then
+			mkdir -p /var/run/dbus
+		fi
+		if [ ! -e /var/run/mysql ]; then
+			mkdir -p /var/run/mysql
+			chown mysql:mysql /var/run/mysql
+		fi
+		if [ ! -e /var/run/pluto ]; then
+			mkdir -p /var/run/pluto
+			chmod 700 /var/run/pluto
+		fi
+		if [ ! -e /var/run/saslauthd ]; then
+			mkdir -p /var/run/saslauthd
+		fi
+
+		#
+		# Move /var/spool/cron to ramdisk and make a symlink
+		#
+		if [ ! -L /var/spool/cron ]; then
+			cp -pR /var/spool/cron /var/log/rrd.bak/cron
+			mv /var/spool/cron /var/log/rrd/cron
+			ln -s /var/log/rrd/cron /var/spool/cron
+		fi
+
+		echo_ok
 		;;
 	stop)
 		$0 backup
diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index f8cd865df1..9542c8f485 100644
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -38,6 +38,11 @@ my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
+if ( $mainsettings{'RRDLOG'} eq "" ){
+	$mainsettings{'RRDLOG'}="/var/log/rrd";
+	&General::writehash("${General::swroot}/main/settings", \%mainsettings);
+}
+
 sub updatehdddata{
 	my $disk = $_[0];
 	my $standby;
-- 
2.39.2