layer3: fix function name in wireguard and dhcp

Submitted by Christian Dresel on Dec. 30, 2019, 11:05 a.m.

Details

Message ID 20191230110556.5290-1-fff@chrisi01.de
State Accepted
Headers show

Commit Message

Christian Dresel Dec. 30, 2019, 11:05 a.m.
The configuregateway call only apply and not commit

Signed-off-by: Christian Dresel <fff@chrisi01.de>
---
 src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns            | 2 +-
 src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns b/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
index 3946d70..ad9f1cd 100644
--- a/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
+++ b/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
@@ -12,7 +12,7 @@  configure() {
 	fi
 }
 
-commit() {
+apply() {
 	uci commit dhcp
 }
 
diff --git a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard b/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
index 3013e3f..69a3d74 100644
--- a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
+++ b/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
@@ -133,7 +133,7 @@  configure() {
 	config_foreach add_wgpeer wireguardpeer
 }
 
-commit() {
+apply() {
 	uci commit network
 	uci commit babeld
 	uci commit gateway

Comments

Fabian Blaese Dec. 30, 2019, 11:09 a.m.
Guter Fund, danke!

Reviewed-by: Fabian Bläse <fabian@blaese.de>

Als commit title würde ich jetzt eher sowas vorschlagen, halte ich für aussagekräfter:
"gateway.d: use correct function name for apply hook"

Ist denke ich auch so ok, wie es ist. Aber für den nächsten Patch.. :-)

Gruß
Fabian

On 30.12.19 12:05, Christian Dresel wrote:
> The configuregateway call only apply and not commit
> 
> Signed-off-by: Christian Dresel <fff@chrisi01.de>
> ---
>  src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns            | 2 +-
>  src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns b/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
> index 3946d70..ad9f1cd 100644
> --- a/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
> +++ b/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
> @@ -12,7 +12,7 @@ configure() {
>  	fi
>  }
>  
> -commit() {
> +apply() {
>  	uci commit dhcp
>  }
>  
> diff --git a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard b/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
> index 3013e3f..69a3d74 100644
> --- a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
> +++ b/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
> @@ -133,7 +133,7 @@ configure() {
>  	config_foreach add_wgpeer wireguardpeer
>  }
>  
> -commit() {
> +apply() {
>  	uci commit network
>  	uci commit babeld
>  	uci commit gateway
>
Robert Langhammer Dec. 30, 2019, 11:59 a.m.
Hi Christian,

sehr gut!! Ich hatte das auch jedesmal übersehen.

Reviewed-by: Robert Langhammer <rlanghammer@web.de>


Am 30.12.19 um 12:05 schrieb Christian Dresel:
> The configuregateway call only apply and not commit
>
> Signed-off-by: Christian Dresel <fff@chrisi01.de>
> ---
>  src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns            | 2 +-
>  src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns b/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
> index 3946d70..ad9f1cd 100644
> --- a/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
> +++ b/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
> @@ -12,7 +12,7 @@ configure() {
>  	fi
>  }
>
> -commit() {
> +apply() {
>  	uci commit dhcp
>  }
>
> diff --git a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard b/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
> index 3013e3f..69a3d74 100644
> --- a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
> +++ b/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
> @@ -133,7 +133,7 @@ configure() {
>  	config_foreach add_wgpeer wireguardpeer
>  }
>
> -commit() {
> +apply() {
>  	uci commit network
>  	uci commit babeld
>  	uci commit gateway
Adrian Schmutzler Dec. 30, 2019, 2:19 p.m.
> Als commit title würde ich jetzt eher sowas vorschlagen, halte ich für aussagekräfter: 
> "gateway.d: use correct function name for apply hook" 

Mit geändertem Titel und PKG_RELEASE bump applied.