From 94fd3231dadd75818de05cb73acb364a210399b5 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Mon, 10 Aug 2015 13:52:08 +0200
Subject: [PATCH 1/2] OONF Init script fix for the case that /var/etc does not
 exist

---
 oonf-init-scripts/Makefile           | 2 +-
 oonf-init-scripts/files/oonf_init.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/oonf-init-scripts/Makefile b/oonf-init-scripts/Makefile
index fd1aa06..8bfbf6e 100644
--- a/oonf-init-scripts/Makefile
+++ b/oonf-init-scripts/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=oonf-init-scripts
-PKG_VERSION:=0.9.1-r2
+PKG_VERSION:=0.9.1-r3
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/oonf-init-scripts/files/oonf_init.sh b/oonf-init-scripts/files/oonf_init.sh
index 1c7b414..8a1bacf 100755
--- a/oonf-init-scripts/files/oonf_init.sh
+++ b/oonf-init-scripts/files/oonf_init.sh
@@ -42,6 +42,7 @@ oonf_add_devices_to_configuration()
   # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
 
   # /var is in ramdisc/tmpfs
+  mkdir -p /var/etc
   uci export ${DAEMON} >"/var/etc/${DAEMON}_dev"
 
   while section="$( uci -q -c /etc/config get "${DAEMON}.@[${i}]" )"; do {

From b8e9b6486bb40373ee285137a06eec4e8dfa63d7 Mon Sep 17 00:00:00 2001
From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Wed, 12 Aug 2015 15:56:31 +0200
Subject: [PATCH 2/2] Move OONF temporary config to /var/run

---
 oonf-init-scripts/files/oonf_init.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/oonf-init-scripts/files/oonf_init.sh b/oonf-init-scripts/files/oonf_init.sh
index 8a1bacf..8ab5b3b 100755
--- a/oonf-init-scripts/files/oonf_init.sh
+++ b/oonf-init-scripts/files/oonf_init.sh
@@ -42,8 +42,7 @@ oonf_add_devices_to_configuration()
   # olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
 
   # /var is in ramdisc/tmpfs
-  mkdir -p /var/etc
-  uci export ${DAEMON} >"/var/etc/${DAEMON}_dev"
+  uci export ${DAEMON} >"/var/run/${DAEMON}_dev"
 
   while section="$( uci -q -c /etc/config get "${DAEMON}.@[${i}]" )"; do {
     echo "section: ${section}"
@@ -56,7 +55,7 @@ oonf_add_devices_to_configuration()
     case "$( uci -q get "${DAEMON}.@[${i}].ignore" )" in
       1|on|true|enabled|yes)
         oonf_log "removing/ignore section '$section'"
-        uci -q -c /var/etc delete "${DAEMON}_dev.@[${j}]"
+        uci -q -c /var/run delete "${DAEMON}_dev.@[${j}]"
         i=$(( i + 1 ))
 
         continue
@@ -71,15 +70,15 @@ oonf_add_devices_to_configuration()
       if [ ! -z "${device_name}" ]
       then
         # add option 'name' for 'ifname' (e.g. 'mywifi')
-        uci -q -c /var/etc add_list "${DAEMON}_dev.@[${i}].name=${device_name}"
+        uci -q -c /var/run add_list "${DAEMON}_dev.@[${i}].name=${device_name}"
       fi
     } done
     i=$(( $i + 1 ))
   } done
 
-  uci -q -c /var/etc commit "${DAEMON}_dev"
+  uci -q -c /var/run commit "${DAEMON}_dev"
 
-  oonf_log "wrote '/var/etc/${DAEMON}_dev'"
+  oonf_log "wrote '/var/run/${DAEMON}_dev'"
 }
 
 oonf_reread_config()
@@ -106,7 +105,7 @@ start()
   # produce coredumps
   ulimit -c unlimited
 
-  service_start /usr/sbin/${DAEMON} --set global.fork=true --load uci:///var/etc/${DAEMON}_dev
+  service_start /usr/sbin/${DAEMON} --set global.fork=true --load uci:///var/run/${DAEMON}_dev
 }
 
 stop()