From 0be02ac14ead68645b4b150845a990dcda072526 Mon Sep 17 00:00:00 2001 From: Rob White Date: Tue, 30 Jul 2024 21:17:48 +0100 Subject: [PATCH 1/3] Fix - hardcoded mesh bridge name causing multiple instances of odhcp6c Signed-off-by: Rob White --- src/mesh11sd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh11sd b/src/mesh11sd index d6024bf..acc6841 100755 --- a/src/mesh11sd +++ b/src/mesh11sd @@ -828,7 +828,7 @@ check_channel() { link_to_portal=$(cat $tmpdir/dhcp6probe | grep -q -w "Got a valid ADVERTISE" ; echo -n "$?") # NOTE: odhcp6c -p option does not work and pid is not recorded, so we have to look up the pid using ps utility - instances=$(ps | grep "odhcp6c" | grep "/var/run/odhcp6c-renew-br-wan.pid" | awk '{printf "%s ", $1}') + instances=$(ps | grep "odhcp6c" | grep "/var/run/odhcp6c-renew-$device.pid" | awk '{printf "%s ", $1}') for instance in $instances; do kill "$instance" From 7a6d33951b95d9eeeb1b1daacf845598cd052607 Mon Sep 17 00:00:00 2001 From: Rob White Date: Wed, 31 Jul 2024 08:17:22 +0100 Subject: [PATCH 2/3] Update ChangeLog Signed-off-by: Rob White --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index e4661ad..add0c1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +mesh11sd (4.1.1) + * Fix - hardcoded mesh bridge name causing multiple instances of odhcp6c in non-cpe peer mode [bluewavenet] + + -- Rob White Wed, 31 July 2024 07:10:52 +0000 + mesh11sd (4.1.0) * Add - cli option dhcp4_renew [bluewavenet] * Add - default owe transition mode [bluewavenet] From ab29ab23abb503b849d69ce77b44cd283bdeb713 Mon Sep 17 00:00:00 2001 From: Rob White Date: Wed, 31 Jul 2024 08:18:01 +0100 Subject: [PATCH 3/3] Bump to version 4.1.1 for release Signed-off-by: Rob White --- src/mesh11sd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh11sd b/src/mesh11sd index acc6841..340970a 100755 --- a/src/mesh11sd +++ b/src/mesh11sd @@ -12,7 +12,7 @@ # # mesh11sd daemon # -version="4.1.1beta" +version="4.1.1" fixup1=0 ip4pingfailcount=0 network_restart=0