[PATCH 2/4] fff-hoods: move start of configurehood from rc.local to init.d

[robert]

Hi Adrian,


Am 14.09.2018 um 23:44 schrieb mail at adrianschmutzler.de:
> Hallo Robert,
>
> der micrond startet mit START=50.
>
> Wenn wir configurehood erst danach ausführen, können wir nicht auf
> /tmp/started verzichten.
Meinst du wegen Nodewatcher? configurehood schuetzt sich selbst.
>
> Ich weiß nicht, ob wir alles nötige haben, um configurehood vor START=50
> auszuführen.
>
> Und wir hätten wieder das Problem, dass dann ggf. mehrere Minuten lang die
> LEDs nicht gehen, weil configurehood beim random hängt.
Welches random? Wenn /init.d/configurehood startet gibt es nur 2
Moeglichkeiten. Es laeuft an, oder es laeuft schon.
>
> Auch hier fehlt das Entfernen aus rc.local.
>
> Grüße
>
> Adrian
>
>> -----Original Message-----
>> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
>> Of Robert Langhammer
>> Sent: Montag, 10. September 2018 21:48
>> To: franken-dev at freifunk.net
>> Subject: [PATCH 2/4] fff-hoods: move start of configurehood from rc.local
> to
>> init.d
>>
>> and prevent running configurehood multiple times
>>
>> Signed-off-by: Robert Langhammer <rlanghammer at web.de>
>> ---
>>  src/packages/fff/fff-hoods/files/etc/init.d/configurehood   | 9 +++++++++
>>  src/packages/fff/fff-hoods/files/usr/lib/micron.d/fff-hoods | 2 +-
>>  src/packages/fff/fff-hoods/files/usr/sbin/configurehood     | 4 ++++
>>  3 files changed, 14 insertions(+), 1 deletion(-)  create mode 100755
>> src/packages/fff/fff-hoods/files/etc/init.d/configurehood
>>
>> diff --git a/src/packages/fff/fff-hoods/files/etc/init.d/configurehood
>> b/src/packages/fff/fff-hoods/files/etc/init.d/configurehood
>> new file mode 100755
>> index 0000000..61fe735
>> --- /dev/null
>> +++ b/src/packages/fff/fff-hoods/files/etc/init.d/configurehood
>> @@ -0,0 +1,9 @@
>> +#!/bin/sh /etc/rc.common
>> +
>> +START=95
>> +
>> +boot()
>> +{
>> +    /usr/sbin/configurehood
>> +}
>> +
>> diff --git a/src/packages/fff/fff-hoods/files/usr/lib/micron.d/fff-hoods
>> b/src/packages/fff/fff-hoods/files/usr/lib/micron.d/fff-hoods
>> index 39e800e..ca8d798 100644
>> --- a/src/packages/fff/fff-hoods/files/usr/lib/micron.d/fff-hoods
>> +++ b/src/packages/fff/fff-hoods/files/usr/lib/micron.d/fff-hoods
>> @@ -1 +1 @@
>> -*/5 * * * * [ -f /tmp/started ] && /usr/sbin/configurehood
>> +*/5 * * * * /usr/sbin/configurehood
>> diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
>> b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
>> index 47e228b..7a330d9 100755
>> --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
>> +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
>> @@ -1,5 +1,9 @@
>>  #!/bin/sh
>>
>> +# prevent multiple runs of the script
>> +
>> +[ $( pidof $( basename $0 )  | wc -w ) -gt 2 ] && exit
>> +
>>  . /usr/share/libubox/jshn.sh
>>  . /lib/functions/fff/keyxchange
>>  . /lib/functions/fff/network
>> --
>> 2.11.0
>