fff-hoods: Fix missing commit for hood name

Submitted by Adrian Schmutzler on Oct. 18, 2017, 6:27 p.m.

Details

Message ID 1508351242-24421-1-git-send-email-freifunk@adrianschmutzler.de
State Accepted
Headers show

Commit Message

Adrian Schmutzler Oct. 18, 2017, 6:27 p.m.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
index 88f6f53..88c0daa 100755
--- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
+++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
@@ -140,7 +140,8 @@  if [ -s /tmp/keyxchangev2data ]; then
 		json_select ".." # back to root
 
 		echo "Setting hood name: $hood"
-		uci set "system.@system[0].hood=$hood"
+		uci -q set "system.@system[0].hood=$hood"
+		uci -q commit system
 
 		if ! wifiDelAll; then
 			echo "Can't delete current wifi setup"

Comments

Fabian Blaese Oct. 19, 2017, 10:04 p.m.
Ist bei mir heute schief gegangen. Wollte grade nen Patch machen, aber es war wohl jemand schneller.

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

Fabian

> On 18. Oct 2017, at 20:27, Adrian Schmutzler <freifunk@adrianschmutzler.de> wrote:
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
> src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> index 88f6f53..88c0daa 100755
> --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> @@ -140,7 +140,8 @@ if [ -s /tmp/keyxchangev2data ]; then
> 		json_select ".." # back to root
> 
> 		echo "Setting hood name: $hood"
> -		uci set "system.@system[0].hood=$hood"
> +		uci -q set "system.@system[0].hood=$hood"
> +		uci -q commit system
> 
> 		if ! wifiDelAll; then
> 			echo "Can't delete current wifi setup"
> --
> 2.7.4
> 
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Adrian Schmutzler Oct. 20, 2017, 3:48 p.m.
Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Adrian Schmutzler
> Sent: Mittwoch, 18. Oktober 2017 20:27
> To: franken-dev@freifunk.net
> Subject: [PATCH] fff-hoods: Fix missing commit for hood name
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> index 88f6f53..88c0daa 100755
> --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> @@ -140,7 +140,8 @@ if [ -s /tmp/keyxchangev2data ]; then
>  		json_select ".." # back to root
> 
>  		echo "Setting hood name: $hood"
> -		uci set "system.@system[0].hood=$hood"
> +		uci -q set "system.@system[0].hood=$hood"
> +		uci -q commit system
> 
>  		if ! wifiDelAll; then
>  			echo "Can't delete current wifi setup"
> --
> 2.7.4
> 
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Tim Niemeyer Nov. 2, 2017, 8:11 p.m.
Hi

Nach rebase, applied.

Tim

Am Mittwoch, den 18.10.2017, 20:27 +0200 schrieb Adrian Schmutzler:
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> index 88f6f53..88c0daa 100755
> --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> @@ -140,7 +140,8 @@ if [ -s /tmp/keyxchangev2data ]; then
>  		json_select ".." # back to root
>  
>  		echo "Setting hood name: $hood"
> -		uci set "system.@system[0].hood=$hood"
> +		uci -q set "system.@system[0].hood=$hood"
> +		uci -q commit system
>  
>  		if ! wifiDelAll; then
>  			echo "Can't delete current wifi setup"
> -- 
> 2.7.4
>