mirror
/
gluon-packages
mirror of https://github.com/freifunk-gluon/packages.git
1
0
Fork 0
Code Releases Activity

Fix race condition in dnsmasq config dir handling

This commit is contained in:
Matthias Schiffer 2014-01-22 19:44:27 +01:00
parent 8681dde4e2
commit b25519bc02
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gluon/gluon-core/files/etc/init.d/gluon-core Executable file
View File

@ -0,0 +1,8 @@
#!/bin/sh /etc/rc.common
START=11
start() {
mkdir -p /var/gluon/dnsmasq.d
}

2
gluon/gluon-core/files/lib/gluon/upgrade/core/invariant/010-dnsmasq.d
View File

@ -1,3 +1,3 @@
#!/bin/sh
echo 'conf-dir=/lib/gluon/dnsmasq.d' > /etc/dnsmasq.conf
echo -e 'conf-dir=/lib/gluon/dnsmasq.d\nconf-dir=/var/gluon/dnsmasq.d' > /etc/dnsmasq.conf

1
gluon/gluon-mesh-batman-adv/files/lib/gluon/dnsmasq.d/010-mesh-batman-adv.conf
View File

@ -1 +0,0 @@
/var/gluon/mesh-batman-adv/dnsmasq.conf

4
gluon/gluon-mesh-batman-adv/generate/lib/gluon/odhcp6c.d/010-mesh-batman-adv
View File

@ -10,12 +10,12 @@ for ns in $RDNSS $RA_DNS; do
done
done > /var/gluon/mesh-batman-adv/dnsmasq.conf.$$
if cmp -s /var/gluon/mesh-batman-adv/dnsmasq.conf.$$ /var/gluon/mesh-batman-adv/dnsmasq.conf; then
if cmp -s /var/gluon/mesh-batman-adv/dnsmasq.conf.$$ /var/gluon/dnsmasq.d/mesh-batman-adv.conf; then
rm /var/gluon/mesh-batman-adv/dnsmasq.conf.$$
exit 0
fi
lock /var/gluon/mesh-batman-adv/dnsmasq.conf.lock
mv -f /var/gluon/mesh-batman-adv/dnsmasq.conf.$$ /var/gluon/mesh-batman-adv/dnsmasq.conf
mv -f /var/gluon/mesh-batman-adv/dnsmasq.conf.$$ /var/gluon/dnsmasq.d/mesh-batman-adv.conf
/etc/init.d/dnsmasq restart
lock -u /var/gluon/mesh-batman-adv/dnsmasq.conf.lock