Skip to content
Snippets Groups Projects
Commit 842787eb authored by Jan-Tarek Butt's avatar Jan-Tarek Butt
Browse files

drop patches 0003,0005 and 0006 because its already included in gluon v2019.1.x

parent f9679d4e
No related branches found
No related tags found
1 merge request!77Gluon 2019.1.x
This diff is collapsed.
From 6e53b1a4d94f2f1cc5599e47b24137128dc06019 Mon Sep 17 00:00:00 2001
From: Tata <tarek@ring0.de>
Date: Tue, 23 Apr 2019 17:34:49 +0200
Subject: [PATCH 5/6] Add mechanism to reload domain related services (#1710)
---
.../files/lib/gluon/reload.d/500-core | 2 ++
package/gluon-core/files/usr/bin/gluon-reload | 17 +++++++++++++++++
.../lib/gluon/reload.d/200-mesh-vpn-fastd-stop | 2 ++
.../lib/gluon/reload.d/800-mesh-vpn-fastd-start | 2 ++
.../reload.d/200-mesh-vpn-tunneldigger-stop | 2 ++
.../reload.d/800-mesh-vpn-tunneldigger-start | 2 ++
.../files/lib/gluon/reload.d/100-respondd-stop | 2 ++
.../files/lib/gluon/reload.d/900-respondd-start | 2 ++
8 files changed, 31 insertions(+)
create mode 100755 package/gluon-core/files/lib/gluon/reload.d/500-core
create mode 100755 package/gluon-core/files/usr/bin/gluon-reload
create mode 100755 package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop
create mode 100755 package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/800-mesh-vpn-fastd-start
create mode 100755 package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop
create mode 100755 package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start
create mode 100755 package/gluon-respondd/files/lib/gluon/reload.d/100-respondd-stop
create mode 100755 package/gluon-respondd/files/lib/gluon/reload.d/900-respondd-start
diff --git a/package/gluon-core/files/lib/gluon/reload.d/500-core b/package/gluon-core/files/lib/gluon/reload.d/500-core
new file mode 100755
index 00000000..bc864087
--- /dev/null
+++ b/package/gluon-core/files/lib/gluon/reload.d/500-core
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/network restart
diff --git a/package/gluon-core/files/usr/bin/gluon-reload b/package/gluon-core/files/usr/bin/gluon-reload
new file mode 100755
index 00000000..805f4201
--- /dev/null
+++ b/package/gluon-core/files/usr/bin/gluon-reload
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cd "/lib/gluon/reload.d" || exit 1
+
+err=0
+
+for script in *; do
+ echo "Reloading: ${script}"
+ ./"$script" || err=1
+done
+
+if [ $err -eq 1 ]; then
+ echo 'One or more daemons failed to reload.' >&2
+ exit 1
+fi
+
+exit 0
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop b/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop
new file mode 100755
index 00000000..9e860c40
--- /dev/null
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/fastd stop
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/800-mesh-vpn-fastd-start b/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/800-mesh-vpn-fastd-start
new file mode 100755
index 00000000..e8aad1e6
--- /dev/null
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/800-mesh-vpn-fastd-start
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/fastd start
diff --git a/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop b/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop
new file mode 100755
index 00000000..651530b2
--- /dev/null
+++ b/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/tunneldigger stop
diff --git a/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start b/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start
new file mode 100755
index 00000000..9b174f17
--- /dev/null
+++ b/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/tunneldigger start
diff --git a/package/gluon-respondd/files/lib/gluon/reload.d/100-respondd-stop b/package/gluon-respondd/files/lib/gluon/reload.d/100-respondd-stop
new file mode 100755
index 00000000..f7283238
--- /dev/null
+++ b/package/gluon-respondd/files/lib/gluon/reload.d/100-respondd-stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/gluon-respondd stop
diff --git a/package/gluon-respondd/files/lib/gluon/reload.d/900-respondd-start b/package/gluon-respondd/files/lib/gluon/reload.d/900-respondd-start
new file mode 100755
index 00000000..3890bd77
--- /dev/null
+++ b/package/gluon-respondd/files/lib/gluon/reload.d/900-respondd-start
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/gluon-respondd start
--
2.20.1
From e32e68191c4f581d9ada470e0eedd4fe8a201a7c Mon Sep 17 00:00:00 2001
From: runner01 <runner01@ffnw.de>
Date: Sat, 14 Sep 2019 07:54:58 +0200
Subject: [PATCH 6/6] modules: bump gluon modules to
9a364fb8d0a4f9fecb6a3aac7525fedf759fe81a
---
modules | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules b/modules
index 6db2954f..654c7dbd 100644
--- a/modules
+++ b/modules
@@ -17,5 +17,4 @@ PACKAGES_LUCI_BRANCH=openwrt-18.06
PACKAGES_LUCI_COMMIT=4ba85e3d82b684262c570e38a72d2dc3bb712a13
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_BRANCH=v2018.2.x
-PACKAGES_GLUON_COMMIT=a0ab6d6e712f9cc736e834ef3a8a5d2b4fc2a708
+PACKAGES_GLUON_COMMIT=9a364fb8d0a4f9fecb6a3aac7525fedf759fe81a
--
2.20.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment