Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #130 from HRogge/master

Browse source 
OONF Init temporary uci moved to /var/run
This commit is contained in:
Bastian Bittorf 2015-08-13 14:53:13 +02:00
commit 91a8e522b0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
oonf-init-scripts/Makefile
View file

@ -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)

12
oonf-init-scripts/files/oonf_init.sh
View file

@ -42,7 +42,7 @@ oonf_add_devices_to_configuration()
# olsrd2.@interface[2].ifname='wan lan wlanadhoc wlanadhocRADIO1'
# /var is in ramdisc/tmpfs
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}"
@ -55,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
@ -70,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()
@ -105,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()