From 228bec09bf8245e03193d8d69a0999c7059ac915 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 3 Dec 2015 16:34:59 +0000
Subject: [PATCH] ramdisk: Migrate everything during the update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/core/96/filelists/files |  8 ++++++++
 config/rootfiles/core/96/update.sh       | 26 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/config/rootfiles/core/96/filelists/files b/config/rootfiles/core/96/filelists/files
index 9e64edc89d..63bfa536a5 100644
--- a/config/rootfiles/core/96/filelists/files
+++ b/config/rootfiles/core/96/filelists/files
@@ -1,6 +1,14 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/snort
+etc/vnstat.conf
+etc/rc.d/init.d/cleanfs
+etc/rc.d/init.d/collectd
+etc/rc.d/init.d/functions
+etc/rc.d/init.d/vnstat
+etc/rc.d/rc0.d/K51vnstat
+etc/rc.d/rc3.d/S01vnstat
+etc/rc.d/rc6.d/K51vnstat
 opt/pakfire/lib/functions.pl
 usr/sbin/convert-portfw
 var/ipfire/general-functions.pl
diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh
index 764e6bf09e..b415337fb9 100644
--- a/config/rootfiles/core/96/update.sh
+++ b/config/rootfiles/core/96/update.sh
@@ -33,6 +33,24 @@ done
 
 # Stop services
 /etc/init.d/fcron stop
+/etc/init.d/collectd stop
+qosctrl stop
+
+# Backup RRDs
+if [ -d "/var/log/rrd.bak" ]; then
+	# Umount ramdisk
+	umount -l "/var/log/rrd"
+	rm -f "/var/log/rrd"
+
+	mv "/var/log/rrd.bak/vnstat" "/var/log/vnstat"
+	mv "/var/log/rrd.bak" "/var/log/rrd"
+fi
+
+# Remove old scripts
+rm -f /etc/rc.d/init.d/tmpfs \
+	/etc/rc.d/rc0.d/K85tmpfs \
+	/etc/rc.d/rc3.d/S01tmpfs \
+	/etc/rc.d/rc6.d/K85tmpfs
 
 # Extract files
 extract_files
@@ -40,6 +58,11 @@ extract_files
 # Update Language cache
 # /usr/local/bin/update-lang-cache
 
+# Keep (almost) old ramdisk behaviour
+if [ ! -e "/etc/sysconfig/ramdisk" ]; then
+	echo "RAMDISK_MODE=2" > /etc/sysconfig/ramdisk
+fi
+
 if [ -L "/var/spool/cron" ]; then
 	rm -f /var/spool/cron
 	mv /var/log/rrd/cron /var/spool/cron
@@ -47,8 +70,11 @@ if [ -L "/var/spool/cron" ]; then
 fi
 
 # Start services
+/etc/init.d/collectd start
+/etc/init.d/vnstat start
 /etc/init.d/fcron start
 /etc/init.d/dnsmasq restart
+qosctrl start
 
 # This update need a reboot...
 #touch /var/run/need_reboot
-- 
2.39.5