[PATCH 4/4] hood/sector files: Move files from /www to /tmp and link there

Adrian Schmutzler freifunk at adrianschmutzler.de
Mi Jun 13 16:36:06 CEST 2018


With this patch, changing the hood and sector files happens in
memory, so we do not have to write on flash "frequently".

Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 src/packages/fff/fff-hoods/files/usr/sbin/configurehood           | 1 -
 src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange | 4 +++-
 src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd     | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
index 1c1eda7..dd76af9 100755
--- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
+++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
@@ -9,7 +9,6 @@
 
 sectorfilelocal=/etc/sectorfile
 sectorfiletmp=/tmp/sectorfile
-sectorfilewww=/www/hood/sectorfile
 
 hoodfilelocal=/etc/hoodfile
 hoodfileisauth=/tmp/hoodfileisauth
diff --git a/src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange b/src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange
index 40ebe4f..c0e35ac 100644
--- a/src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange
+++ b/src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange
@@ -6,7 +6,9 @@
 
 hoodfiletmp="/tmp/hoodfile"
 hoodfileref="/tmp/hoodfileref"
-hoodfilewww="/www/hood/keyxchangev2data"
+hoodfilewww="/tmp/hoodfilewww"
+
+sectorfilewww="/tmp/sectorfilewww"
 
 getJsonPath() {
 	jsonfile=""
diff --git a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
index 42376ad..bb99900 100644
--- a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
+++ b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+. /lib/functions/fff/keyxchange
+
+ln -s "$hoodfilewww" /www/hood/keyxchangev2data
+ln -s "$sectorfilewww" /www/hood/sectorfile
+
 uci batch <<EOF
   delete uhttpd.main
   delete uhttpd.public
-- 
2.7.4



Mehr Informationen über die Mailingliste franken-dev