From ff441e4d3fb96d71b4d547fb7b4ab65ef18a51bd Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 22 Dec 2015 10:26:27 +0000 Subject: [PATCH 1/4] core96: Fix deleting the old ramdisk directory Signed-off-by: Michael Tremer --- config/rootfiles/core/96/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh index a3cf5cfd9..d724da289 100644 --- a/config/rootfiles/core/96/update.sh +++ b/config/rootfiles/core/96/update.sh @@ -40,7 +40,7 @@ qosctrl stop if [ -d "/var/log/rrd.bak" ]; then # Umount ramdisk umount -l "/var/log/rrd" - rm -f "/var/log/rrd" + rm -rf "/var/log/rrd" mv "/var/log/rrd.bak/vnstat" "/var/log/vnstat" mv "/var/log/rrd.bak" "/var/log/rrd" From 1a781c8a29b2a8e758ec556d4e6f845b6db78dff Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 22 Dec 2015 10:27:26 +0000 Subject: [PATCH 2/4] core96: Correctly call qosctrl Signed-off-by: Michael Tremer --- config/rootfiles/core/96/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh index d724da289..acd8b0c1a 100644 --- a/config/rootfiles/core/96/update.sh +++ b/config/rootfiles/core/96/update.sh @@ -34,7 +34,7 @@ done # Stop services /etc/init.d/fcron stop /etc/init.d/collectd stop -qosctrl stop +/usr/local/bin/qosctrl stop # Backup RRDs if [ -d "/var/log/rrd.bak" ]; then @@ -83,7 +83,7 @@ fi /etc/init.d/vnstat start /etc/init.d/fcron start /etc/init.d/dnsmasq restart -qosctrl start +/usr/local/bin/qosctrl start # Disable loading of cryptodev sed -e "s/^cryptodev/# &/g" -i /etc/sysconfig/modules From 32dd84e81722dfb6b3053b9643deef1e6113e68f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 22 Dec 2015 15:10:31 +0000 Subject: [PATCH 3/4] core96: Regenerate language cache Signed-off-by: Michael Tremer --- config/rootfiles/core/96/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh index acd8b0c1a..66723642a 100644 --- a/config/rootfiles/core/96/update.sh +++ b/config/rootfiles/core/96/update.sh @@ -56,7 +56,7 @@ rm -f /etc/rc.d/init.d/tmpfs \ extract_files # Update Language cache -# /usr/local/bin/update-lang-cache +/usr/local/bin/update-lang-cache # Keep (almost) old ramdisk behaviour if [ ! -e "/etc/sysconfig/ramdisk" ]; then From c26171b4b4d6606e2e64bb9c4de36223fea0924d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 23 Dec 2015 11:32:53 +0100 Subject: [PATCH 4/4] core96: remove rrd ramdisk entry from fstab --- config/rootfiles/core/96/update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh index 66723642a..fa53cea4c 100644 --- a/config/rootfiles/core/96/update.sh +++ b/config/rootfiles/core/96/update.sh @@ -58,6 +58,9 @@ extract_files # Update Language cache /usr/local/bin/update-lang-cache +# Remove Ramdisk entry from fstab +sed -i -e "s|^none\s/var/log/rrd.*||g" /etc/fstab + # Keep (almost) old ramdisk behaviour if [ ! -e "/etc/sysconfig/ramdisk" ]; then echo "RAMDISK_MODE=2" > /etc/sysconfig/ramdisk