Fixed Problem with port mode changing

Submitted by Jan Kraus on Aug. 2, 2016, 11:48 a.m.

Details

Message ID 1470138515-11665-1-git-send-email-mayosemmel@gmail.com
State Accepted, archived
Commit 6786d40096b27d267daa98f5b901cbfa4951b17f
Headers show

Commit Message

Jan Kraus Aug. 2, 2016, 11:48 a.m.
Since the change of wireless configuration, the bat0 interface is missing after changing the port mode.
The reason is that n uci-default script of fff-wireless the network config of w2mesh is added.
In this configuration the w2mesh interface is added to batman.

In consequence of the change to uci configuration, it's no longer needed to reset the network config.
So this seems to be the simplest fix.

Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
---
 src/packages/fff/fff-network/ar71xx/network.mode          | 1 -
 src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html | 1 -
 2 files changed, 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-network/ar71xx/network.mode b/src/packages/fff/fff-network/ar71xx/network.mode
index de16aa3..8697032 100644
--- a/src/packages/fff/fff-network/ar71xx/network.mode
+++ b/src/packages/fff/fff-network/ar71xx/network.mode
@@ -5,7 +5,6 @@ 
 ## If you want to change their behavior, you can do so below.
 ## After that you have to reset the config with following commands.
 #cp /rom/etc/sysctl.conf /etc/sysctl.conf
-#cp /rom/etc/config/network /etc/config/network
 #reboot
 #
 ### The canonical syntax of this file is:
diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
index acec550..c2d5890 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
@@ -6,7 +6,6 @@  if [ "$REQUEST_METHOD" == "POST" ] ; then
 	sed -i '/^.*# set via WebUI/d' /etc/network.mode
 	echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.mode
 	cp /rom/etc/sysctl.conf /etc/sysctl.conf
-	cp /rom/etc/config/network /etc/config/network
 	do_reboot=1
 	MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
 fi

Comments

Christian Dresel Aug. 20, 2016, 2:58 p.m.
Danke für den fix und für die Erklärung was das Ding tut, jetzt
verstanden :)

Reviewed-by: Christian Dresel <fff@chrisi01.de>

mfg

Christian

On 20.08.2016 17:00, Tim Niemeyer wrote:
> Hi
>
> Sollte gehen..
>
> Bitte beim Applien die maximale Zeichenlänge der Commit-Message
> beachten.
>
> Reviewed-by: Tim Niemeyer <tim@tn-x.org>
>
> Tim
>
> Am Dienstag, den 02.08.2016, 13:48 +0200 schrieb Jan Kraus:
>> Since the change of wireless configuration, the bat0 interface is missing after changing the port mode.
>> The reason is that n uci-default script of fff-wireless the network config of w2mesh is added.
>> In this configuration the w2mesh interface is added to batman.
>>
>> In consequence of the change to uci configuration, it's no longer needed to reset the network config.
>> So this seems to be the simplest fix.
>>
>> Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
>> ---
>>  src/packages/fff/fff-network/ar71xx/network.mode          | 1 -
>>  src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html | 1 -
>>  2 files changed, 2 deletions(-)
>>
>> diff --git a/src/packages/fff/fff-network/ar71xx/network.mode b/src/packages/fff/fff-network/ar71xx/network.mode
>> index de16aa3..8697032 100644
>> --- a/src/packages/fff/fff-network/ar71xx/network.mode
>> +++ b/src/packages/fff/fff-network/ar71xx/network.mode
>> @@ -5,7 +5,6 @@
>>  ## If you want to change their behavior, you can do so below.
>>  ## After that you have to reset the config with following commands.
>>  #cp /rom/etc/sysctl.conf /etc/sysctl.conf
>> -#cp /rom/etc/config/network /etc/config/network
>>  #reboot
>>  #
>>  ### The canonical syntax of this file is:
>> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
>> index acec550..c2d5890 100755
>> --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
>> +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
>> @@ -6,7 +6,6 @@ if [ "$REQUEST_METHOD" == "POST" ] ; then
>>  	sed -i '/^.*# set via WebUI/d' /etc/network.mode
>>  	echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.mode
>>  	cp /rom/etc/sysctl.conf /etc/sysctl.conf
>> -	cp /rom/etc/config/network /etc/config/network
>>  	do_reboot=1
>>  	MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
>>  fi
>> -- 
>> 2.1.4
>>
>
>
Tim Niemeyer Aug. 20, 2016, 3 p.m.
Hi

Sollte gehen..

Bitte beim Applien die maximale Zeichenlänge der Commit-Message
beachten.

Reviewed-by: Tim Niemeyer <tim@tn-x.org>

Tim

Am Dienstag, den 02.08.2016, 13:48 +0200 schrieb Jan Kraus:
> Since the change of wireless configuration, the bat0 interface is missing after changing the port mode.
> The reason is that n uci-default script of fff-wireless the network config of w2mesh is added.
> In this configuration the w2mesh interface is added to batman.
> 
> In consequence of the change to uci configuration, it's no longer needed to reset the network config.
> So this seems to be the simplest fix.
> 
> Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
> ---
>  src/packages/fff/fff-network/ar71xx/network.mode          | 1 -
>  src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/src/packages/fff/fff-network/ar71xx/network.mode b/src/packages/fff/fff-network/ar71xx/network.mode
> index de16aa3..8697032 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.mode
> +++ b/src/packages/fff/fff-network/ar71xx/network.mode
> @@ -5,7 +5,6 @@
>  ## If you want to change their behavior, you can do so below.
>  ## After that you have to reset the config with following commands.
>  #cp /rom/etc/sysctl.conf /etc/sysctl.conf
> -#cp /rom/etc/config/network /etc/config/network
>  #reboot
>  #
>  ### The canonical syntax of this file is:
> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> index acec550..c2d5890 100755
> --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> @@ -6,7 +6,6 @@ if [ "$REQUEST_METHOD" == "POST" ] ; then
>  	sed -i '/^.*# set via WebUI/d' /etc/network.mode
>  	echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.mode
>  	cp /rom/etc/sysctl.conf /etc/sysctl.conf
> -	cp /rom/etc/config/network /etc/config/network
>  	do_reboot=1
>  	MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
>  fi
> -- 
> 2.1.4
>
Jan Kraus Aug. 20, 2016, 3:22 p.m.
Und applied

Jan
Am Samstag, den 20.08.2016, 16:58 +0200 schrieb Christian Dresel:
> Danke für den fix und für die Erklärung was das Ding tut, jetzt
> verstanden :)
> 
> Reviewed-by: Christian Dresel <fff@chrisi01.de>
> 
> mfg
> 
> Christian
> 
> On 20.08.2016 17:00, Tim Niemeyer wrote:
> 
> > Hi
> > 
> > Sollte gehen..
> > 
> > Bitte beim Applien die maximale Zeichenlänge der Commit-Message
> > beachten.
> > 
> > Reviewed-by: Tim Niemeyer <tim@tn-x.org>
> > 
> > Tim
> > 
> > Am Dienstag, den 02.08.2016, 13:48 +0200 schrieb Jan Kraus:
> > > Since the change of wireless configuration, the bat0 interface is missing after changing the port mode.
> > > The reason is that n uci-default script of fff-wireless the network config of w2mesh is added.
> > > In this configuration the w2mesh interface is added to batman.
> > > 
> > > In consequence of the change to uci configuration, it's no longer needed to reset the network config.
> > > So this seems to be the simplest fix.
> > > 
> > > Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
> > > ---
> > >  src/packages/fff/fff-network/ar71xx/network.mode          | 1 -
> > >  src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html | 1 -
> > >  2 files changed, 2 deletions(-)
> > > 
> > > diff --git a/src/packages/fff/fff-network/ar71xx/network.mode b/src/packages/fff/fff-network/ar71xx/network.mode
> > > index de16aa3..8697032 100644
> > > --- a/src/packages/fff/fff-network/ar71xx/network.mode
> > > +++ b/src/packages/fff/fff-network/ar71xx/network.mode
> > > @@ -5,7 +5,6 @@
> > >  ## If you want to change their behavior, you can do so below.
> > >  ## After that you have to reset the config with following commands.
> > >  #cp /rom/etc/sysctl.conf /etc/sysctl.conf
> > > -#cp /rom/etc/config/network /etc/config/network
> > >  #reboot
> > >  #
> > >  ### The canonical syntax of this file is:
> > > diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> > > index acec550..c2d5890 100755
> > > --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> > > +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> > > @@ -6,7 +6,6 @@ if [ "$REQUEST_METHOD" == "POST" ] ; then
> > >  	sed -i '/^.*# set via WebUI/d' /etc/network.mode
> > >  	echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.mode
> > >  	cp /rom/etc/sysctl.conf /etc/sysctl.conf
> > > -	cp /rom/etc/config/network /etc/config/network
> > >  	do_reboot=1
> > >  	MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
> > >  fi
> >
Jan Kraus Aug. 20, 2016, 3:23 p.m.
Und applied

Jan
Am Samstag, den 20.08.2016, 16:58 +0200 schrieb Christian Dresel:
> Danke für den fix und für die Erklärung was das Ding tut, jetzt
> verstanden :)
> 
> Reviewed-by: Christian Dresel <fff@chrisi01.de>
> 
> mfg
> 
> Christian
> 
> On 20.08.2016 17:00, Tim Niemeyer wrote:
> 
> > Hi
> > 
> > Sollte gehen..
> > 
> > Bitte beim Applien die maximale Zeichenlänge der Commit-Message
> > beachten.
> > 
> > Reviewed-by: Tim Niemeyer <tim@tn-x.org>
> > 
> > Tim
> > 
> > Am Dienstag, den 02.08.2016, 13:48 +0200 schrieb Jan Kraus:
> > > Since the change of wireless configuration, the bat0 interface is missing after changing the port mode.
> > > The reason is that n uci-default script of fff-wireless the network config of w2mesh is added.
> > > In this configuration the w2mesh interface is added to batman.
> > > 
> > > In consequence of the change to uci configuration, it's no longer needed to reset the network config.
> > > So this seems to be the simplest fix.
> > > 
> > > Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
> > > ---
> > >  src/packages/fff/fff-network/ar71xx/network.mode          | 1 -
> > >  src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html | 1 -
> > >  2 files changed, 2 deletions(-)
> > > 
> > > diff --git a/src/packages/fff/fff-network/ar71xx/network.mode b/src/packages/fff/fff-network/ar71xx/network.mode
> > > index de16aa3..8697032 100644
> > > --- a/src/packages/fff/fff-network/ar71xx/network.mode
> > > +++ b/src/packages/fff/fff-network/ar71xx/network.mode
> > > @@ -5,7 +5,6 @@
> > >  ## If you want to change their behavior, you can do so below.
> > >  ## After that you have to reset the config with following commands.
> > >  #cp /rom/etc/sysctl.conf /etc/sysctl.conf
> > > -#cp /rom/etc/config/network /etc/config/network
> > >  #reboot
> > >  #
> > >  ### The canonical syntax of this file is:
> > > diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> > > index acec550..c2d5890 100755
> > > --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> > > +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
> > > @@ -6,7 +6,6 @@ if [ "$REQUEST_METHOD" == "POST" ] ; then
> > >  	sed -i '/^.*# set via WebUI/d' /etc/network.mode
> > >  	echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.mode
> > >  	cp /rom/etc/sysctl.conf /etc/sysctl.conf
> > > -	cp /rom/etc/config/network /etc/config/network
> > >  	do_reboot=1
> > >  	MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
> > >  fi
> >