From 8e6a185baf377aca07adfc5caead3a0c8e7782df Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Thu, 12 May 2016 01:28:34 +0200 Subject: [PATCH 1/6] externalize radvd arguments for gluon-radvd --- .../files/lib/gluon/radvd/arguments | 4 ++++ package/gluon-radvd/files/etc/init.d/gluon-radvd | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments b/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments new file mode 100644 index 00000000..61bcf282 --- /dev/null +++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments @@ -0,0 +1,4 @@ +#!/usr/bin/lua +local site = require "gluon.site_config" +print("-i br-client -p " .. site.prefix6) + diff --git a/package/gluon-radvd/files/etc/init.d/gluon-radvd b/package/gluon-radvd/files/etc/init.d/gluon-radvd index d7a981d4..d1488dce 100755 --- a/package/gluon-radvd/files/etc/init.d/gluon-radvd +++ b/package/gluon-radvd/files/etc/init.d/gluon-radvd @@ -7,7 +7,7 @@ SERVICE_DAEMONIZE=1 start() { - service_start /usr/sbin/uradvd -i br-client -p $(lua -e 'print(require("gluon.site_config").prefix6)') + service_start /usr/sbin/uradvd $(/lib/gluon/radvd/arguments) } stop() { From 9950251e6f79cd443bb21b6c52220cd0907b843b Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Thu, 12 May 2016 08:17:44 +0200 Subject: [PATCH 2/6] scripts with +x execute much better, removed newline --- .../gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments | 1 - 1 file changed, 1 deletion(-) mode change 100644 => 100755 package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments b/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments old mode 100644 new mode 100755 index 61bcf282..4062748a --- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments +++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments @@ -1,4 +1,3 @@ #!/usr/bin/lua local site = require "gluon.site_config" print("-i br-client -p " .. site.prefix6) - From 43c446fcae7ee18cbfd968b3f81af80b69d66750 Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Thu, 12 May 2016 15:06:13 +0200 Subject: [PATCH 3/6] add depends for gluon-radvd-provider --- package/gluon-mesh-batman-adv-core/Makefile | 1 + package/gluon-radvd/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gluon-mesh-batman-adv-core/Makefile b/package/gluon-mesh-batman-adv-core/Makefile index 7ae7c305..d72da8e9 100644 --- a/package/gluon-mesh-batman-adv-core/Makefile +++ b/package/gluon-mesh-batman-adv-core/Makefile @@ -13,6 +13,7 @@ define Package/gluon-mesh-batman-adv-core CATEGORY:=Gluon TITLE:=Support for batman-adv meshing (core) DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +firewall +libiwinfo + PROVIDES:=gluon-radvd-provider endef define Build/Prepare diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile index 6695673c..db22915f 100644 --- a/package/gluon-radvd/Makefile +++ b/package/gluon-radvd/Makefile @@ -11,7 +11,7 @@ define Package/gluon-radvd SECTION:=gluon CATEGORY:=Gluon TITLE:=Advertise an IPv6 prefix from the node - DEPENDS:=+gluon-core +gluon-ebtables +gluon-mesh-batman-adv +uradvd + DEPENDS:=+gluon-core +gluon-ebtables +gluon-mesh-batman-adv +uradvd +gluon-radvd-provider endef define Package/gluon-radvd/description From d76df9714d454be51922751365e9fb86d8e988bc Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Mon, 16 May 2016 18:34:45 +0200 Subject: [PATCH 4/6] move dependency to ebtables from gluon-radvd to gluon-mesh-batman-adv-core --- .../files/lib/gluon/ebtables/300-radv-input-output | 0 package/gluon-radvd/Makefile | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename package/{gluon-radvd => gluon-mesh-batman-adv-core}/files/lib/gluon/ebtables/300-radv-input-output (100%) diff --git a/package/gluon-radvd/files/lib/gluon/ebtables/300-radv-input-output b/package/gluon-mesh-batman-adv-core/files/lib/gluon/ebtables/300-radv-input-output similarity index 100% rename from package/gluon-radvd/files/lib/gluon/ebtables/300-radv-input-output rename to package/gluon-mesh-batman-adv-core/files/lib/gluon/ebtables/300-radv-input-output diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile index db22915f..4f802a6f 100644 --- a/package/gluon-radvd/Makefile +++ b/package/gluon-radvd/Makefile @@ -11,7 +11,7 @@ define Package/gluon-radvd SECTION:=gluon CATEGORY:=Gluon TITLE:=Advertise an IPv6 prefix from the node - DEPENDS:=+gluon-core +gluon-ebtables +gluon-mesh-batman-adv +uradvd +gluon-radvd-provider + DEPENDS:=+gluon-core +gluon-mesh-batman-adv +uradvd +gluon-radvd-provider endef define Package/gluon-radvd/description From 9fbdcaf6890342e0e3207590843be4fafe7f7bc2 Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Wed, 18 May 2016 03:25:50 +0200 Subject: [PATCH 5/6] fix depends --- package/gluon-radvd/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile index 4f802a6f..7a350359 100644 --- a/package/gluon-radvd/Makefile +++ b/package/gluon-radvd/Makefile @@ -11,7 +11,8 @@ define Package/gluon-radvd SECTION:=gluon CATEGORY:=Gluon TITLE:=Advertise an IPv6 prefix from the node - DEPENDS:=+gluon-core +gluon-mesh-batman-adv +uradvd +gluon-radvd-provider + DEPENDS:=+gluon-core +uradvd +gluon-radvd-provider + # TODO: this ought to depend on gluon-mesh-provider endef define Package/gluon-radvd/description From 498f2096853e4dff44b28e38dfc96fe3a7d57769 Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Wed, 15 Jun 2016 01:21:25 +0200 Subject: [PATCH 6/6] check if gluln/radvd/arguments is executable --- package/gluon-radvd/files/etc/init.d/gluon-radvd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gluon-radvd/files/etc/init.d/gluon-radvd b/package/gluon-radvd/files/etc/init.d/gluon-radvd index d1488dce..5e0f5962 100755 --- a/package/gluon-radvd/files/etc/init.d/gluon-radvd +++ b/package/gluon-radvd/files/etc/init.d/gluon-radvd @@ -7,7 +7,9 @@ SERVICE_DAEMONIZE=1 start() { + [ -x /lib/gluon/radvd/arguments ] && { service_start /usr/sbin/uradvd $(/lib/gluon/radvd/arguments) + } } stop() {