[2/2] init.d/fff-hoods: Move call of configurehood to init.d script

Submitted by Adrian Schmutzler on Dec. 23, 2017, 12:38 a.m.

Details

Message ID 1513989495-5204-2-git-send-email-freifunk@adrianschmutzler.de
State Superseded
Headers show

Commit Message

Adrian Schmutzler Dec. 23, 2017, 12:38 a.m.
This ensures that configurehood is executed AFTER alfred.

As a side effect, we move the call of configurehood to the
fff-hoods package, where it belongs.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 bsp/default/root_file_system/etc/rc.local        |  4 ----
 src/packages/fff/fff-hoods/files/etc/init.d/hood | 12 ++++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100755 src/packages/fff/fff-hoods/files/etc/init.d/hood

Patch hide | download patch | download mbox

diff --git a/bsp/default/root_file_system/etc/rc.local b/bsp/default/root_file_system/etc/rc.local
index 7410bae..f174234 100755
--- a/bsp/default/root_file_system/etc/rc.local
+++ b/bsp/default/root_file_system/etc/rc.local
@@ -4,8 +4,4 @@ 
 
 /usr/sbin/configurenetwork
 
-sleep 3
-
-/usr/sbin/configurehood
-
 exit 0
diff --git a/src/packages/fff/fff-hoods/files/etc/init.d/hood b/src/packages/fff/fff-hoods/files/etc/init.d/hood
new file mode 100755
index 0000000..b51efc0
--- /dev/null
+++ b/src/packages/fff/fff-hoods/files/etc/init.d/hood
@@ -0,0 +1,12 @@ 
+#!/bin/sh /etc/rc.common
+
+# Copyright 2017 Adrian Schmutzler
+# License GPLv3
+
+START=99
+
+start()
+{
+	sleep 3
+	/usr/sbin/configurehood
+}

Comments

Christian Dresel Dec. 23, 2017, 10:30 a.m.
Hi

super Idee :) Ich will das ganze nochmal testen (wird vermutlich dieses
Jahr nichts mehr, wenn es jemand anders zuvor reviewen will nur zu,
müsst nicht auf mich warten) bevor ich ein Review drauf werfe, kleine
Frage inline:

On 23.12.2017 01:38, Adrian Schmutzler wrote:
> This ensures that configurehood is executed AFTER alfred.
> 
> As a side effect, we move the call of configurehood to the
> fff-hoods package, where it belongs.
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  bsp/default/root_file_system/etc/rc.local        |  4 ----
>  src/packages/fff/fff-hoods/files/etc/init.d/hood | 12 ++++++++++++
>  2 files changed, 12 insertions(+), 4 deletions(-)
>  create mode 100755 src/packages/fff/fff-hoods/files/etc/init.d/hood
> 
> diff --git a/bsp/default/root_file_system/etc/rc.local b/bsp/default/root_file_system/etc/rc.local
> index 7410bae..f174234 100755
> --- a/bsp/default/root_file_system/etc/rc.local
> +++ b/bsp/default/root_file_system/etc/rc.local
> @@ -4,8 +4,4 @@
>  
>  /usr/sbin/configurenetwork
>  
> -sleep 3
> -
> -/usr/sbin/configurehood
> -
>  exit 0
> diff --git a/src/packages/fff/fff-hoods/files/etc/init.d/hood b/src/packages/fff/fff-hoods/files/etc/init.d/hood
> new file mode 100755
> index 0000000..b51efc0
> --- /dev/null
> +++ b/src/packages/fff/fff-hoods/files/etc/init.d/hood
> @@ -0,0 +1,12 @@
> +#!/bin/sh /etc/rc.common
> +
> +# Copyright 2017 Adrian Schmutzler
> +# License GPLv3
> +
> +START=99
> +
> +start()
> +{
> +	sleep 3

hat dieses Sleep einen Grund?

mfg

Christian

> +	/usr/sbin/configurehood
> +}
>
Adrian Schmutzler Dec. 23, 2017, 1:25 p.m.
Hallo Christian,

das sleep 3 ist damals als Abstandshalter zwischen configurenetwork und configurehood eingeführt worden.

Ich habe ihn einfach mitkopiert.

Grüße

Adrian

> -----Original Message-----
> From: Christian Dresel [mailto:fff@chrisi01.de]
> Sent: Samstag, 23. Dezember 2017 11:30
> To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-
> dev@freifunk.net
> Subject: Re: [PATCH 2/2] init.d/fff-hoods: Move call of configurehood to
> init.d script
> 
> Hi
> 
> super Idee :) Ich will das ganze nochmal testen (wird vermutlich dieses Jahr
> nichts mehr, wenn es jemand anders zuvor reviewen will nur zu, müsst nicht
> auf mich warten) bevor ich ein Review drauf werfe, kleine Frage inline:
> 
> On 23.12.2017 01:38, Adrian Schmutzler wrote:
> > This ensures that configurehood is executed AFTER alfred.
> >
> > As a side effect, we move the call of configurehood to the fff-hoods
> > package, where it belongs.
> >
> > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> > ---
> >  bsp/default/root_file_system/etc/rc.local        |  4 ----
> >  src/packages/fff/fff-hoods/files/etc/init.d/hood | 12 ++++++++++++
> >  2 files changed, 12 insertions(+), 4 deletions(-)  create mode 100755
> > src/packages/fff/fff-hoods/files/etc/init.d/hood
> >
> > diff --git a/bsp/default/root_file_system/etc/rc.local
> > b/bsp/default/root_file_system/etc/rc.local
> > index 7410bae..f174234 100755
> > --- a/bsp/default/root_file_system/etc/rc.local
> > +++ b/bsp/default/root_file_system/etc/rc.local
> > @@ -4,8 +4,4 @@
> >
> >  /usr/sbin/configurenetwork
> >
> > -sleep 3
> > -
> > -/usr/sbin/configurehood
> > -
> >  exit 0
> > diff --git a/src/packages/fff/fff-hoods/files/etc/init.d/hood
> > b/src/packages/fff/fff-hoods/files/etc/init.d/hood
> > new file mode 100755
> > index 0000000..b51efc0
> > --- /dev/null
> > +++ b/src/packages/fff/fff-hoods/files/etc/init.d/hood
> > @@ -0,0 +1,12 @@
> > +#!/bin/sh /etc/rc.common
> > +
> > +# Copyright 2017 Adrian Schmutzler
> > +# License GPLv3
> > +
> > +START=99
> > +
> > +start()
> > +{
> > +	sleep 3
> 
> hat dieses Sleep einen Grund?
> 
> mfg
> 
> Christian
> 
> > +	/usr/sbin/configurehood
> > +}
> >