[PATCH v4 1/2] init.d: Set /tmp/started through init.d instead of rc.local

Tim Niemeyer tim at tn-x.org
Sa Feb 10 15:12:17 CET 2018


Am Sonntag, den 21.01.2018, 22:55 +0100 schrieb Adrian Schmutzler:
> This ensures that /tmp/started is actually set after the end
> of the boot process.
Ich frag mich immer noch, warum wir das noch brauchen.

Bei configurehood muss sichergestellt werden, dass das Script nicht
mehrfach ausgeführt wird, dafür ist das hier nicht hilfreich.

Beim Nodewatcher ist eh alles fragwürdig.

Tim

> 
> Signed-off-by: Christian Dresel <fff at chrisi01.de>
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> 
> ---
> 
> Changes in v2/v3:
> none
> 
> Changes in v4:
> - Moved file to its own package and set dependencies
> ---
>  bsp/default/root_file_system/etc/rc.local          |  2 --
>  src/packages/fff/fff-hoods/Makefile                |  2 +-
>  src/packages/fff/fff-nodewatcher/Makefile          |  2 +-
>  src/packages/fff/fff-started/Makefile              | 39
> ++++++++++++++++++++++
>  .../fff/fff-started/files/etc/init.d/zdone         | 11 ++++++
>  5 files changed, 52 insertions(+), 4 deletions(-)
>  create mode 100644 src/packages/fff/fff-started/Makefile
>  create mode 100755 src/packages/fff/fff-
> started/files/etc/init.d/zdone
> 
> diff --git a/bsp/default/root_file_system/etc/rc.local
> b/bsp/default/root_file_system/etc/rc.local
> index 59042c3..7410bae 100755
> --- a/bsp/default/root_file_system/etc/rc.local
> +++ b/bsp/default/root_file_system/etc/rc.local
> @@ -8,6 +8,4 @@ sleep 3
>  
>  /usr/sbin/configurehood
>  
> -touch /tmp/started
> -
>  exit 0
> diff --git a/src/packages/fff/fff-hoods/Makefile
> b/src/packages/fff/fff-hoods/Makefile
> index 11ab6d1..2081e62 100644
> --- a/src/packages/fff/fff-hoods/Makefile
> +++ b/src/packages/fff/fff-hoods/Makefile
> @@ -13,7 +13,7 @@ define Package/$(PKG_NAME)
>      CATEGORY:=Freifunk
>      TITLE:= Freifunk-Franken hoods
>      URL:=http://www.freifunk-franken.de
> -    DEPENDS:=+fff-network +fff-config
> +    DEPENDS:=+fff-network +fff-config +fff-started
>  endef
>  
>  define Package/$(PKG_NAME)/description
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile
> b/src/packages/fff/fff-nodewatcher/Makefile
> index 633ec71..11a0cb6 100644
> --- a/src/packages/fff/fff-nodewatcher/Makefile
> +++ b/src/packages/fff/fff-nodewatcher/Makefile
> @@ -13,7 +13,7 @@ define Package/$(PKG_NAME)
>      CATEGORY:=Freifunk
>      TITLE:= Freifunk-Franken Nodewatcher
>      URL:=http://www.freifunk-franken.de
> -    DEPENDS:=+fff-alfred +micrond +fff-config +fff-random +ip +ip-
> bridge
> +    DEPENDS:=+fff-alfred +micrond +fff-config +fff-random +ip +ip-
> bridge +fff-started
>  endef
>  
>  define Package/$(PKG_NAME)/description
> diff --git a/src/packages/fff/fff-started/Makefile
> b/src/packages/fff/fff-started/Makefile
> new file mode 100644
> index 0000000..39e5e12
> --- /dev/null
> +++ b/src/packages/fff/fff-started/Makefile
> @@ -0,0 +1,39 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-started
> +PKG_VERSION:=1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/$(PKG_NAME)
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:=Freifunk-Franken started
> +    URL:=http://www.freifunk-franken.de
> +endef
> +
> +define Package/$(PKG_NAME)/description
> +    This is the Freifunk Franken Firmware started package.
> +    This packages provides the /tmp/started file.
> +endef
> +
> +define Build/Prepare
> +    echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +    # nothing
> +endef
> +
> +define Build/Compile
> +    # nothing
> +endef
> +
> +define Package/$(PKG_NAME)/install
> +    $(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,$(PKG_NAME)))
> diff --git a/src/packages/fff/fff-started/files/etc/init.d/zdone
> b/src/packages/fff/fff-started/files/etc/init.d/zdone
> new file mode 100755
> index 0000000..f4aaf02
> --- /dev/null
> +++ b/src/packages/fff/fff-started/files/etc/init.d/zdone
> @@ -0,0 +1,11 @@
> +#!/bin/sh /etc/rc.common
> +
> +# Copyright 2017 Adrian Schmutzler
> +# License GPLv3
> +
> +START=99
> +
> +start()
> +{
> +	touch /tmp/started
> +}
> -- 
> 2.7.4
> 
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 488 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20180210/9133971d/attachment.sig>


Mehr Informationen über die Mailingliste franken-dev