freifunk-franken
/
firmware
9
7
Fork 13
Code Issues 48 Pull Requests 7 Releases 17 Wiki Activity

fff-web-ui: require less rebooting #243

Closed
fbl wants to merge 2 commits from fbl:lessreboot into master
pull from: fbl:lessreboot
merge into: freifunk-franken:master
Conversation 2 Commits 2 Files Changed 2 +7 -9
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html
View File

@ -9,8 +9,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.config
sed -i '/^FORCEPARSE/d' /etc/network.config
echo "FORCEPARSE='2'" >> /etc/network.config
do_reboot=1
MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
do_reconfigure=1
MSG='<span class="green">Port Modus wird ge&auml;ndert!</span>'
fi
if [ "$POST_change_twoport" != "" ] ; then
sed -i '/^.*# set via WebUI/d' /etc/network.config
@ -18,8 +18,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
echo "LAN1MODE=\"${POST_mode1}\" # set via WebUI" >> /etc/network.config
sed -i '/^FORCEPARSE/d' /etc/network.config
echo "FORCEPARSE='2'" >> /etc/network.config
do_reboot=1
MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
do_reconfigure=1
MSG='<span class="green">Port Modus wird ge&auml;ndert!</span>'
fi
fi
@ -182,7 +182,6 @@ format_port() {
Wenn diese Einstellung ver&auml;ndert wird, wird eine evtl. vorhandene manuelle Netzwerkkonfiguration in der
<tt>/etc/config/network</tt> &uuml;berschrieben.<br />
Anschlie&szlig;end wird der Router neugestartet.
</td></tr>
</table>
</fieldset>
@ -228,7 +227,6 @@ format_port() {
Wenn diese Einstellung ver&auml;ndert wird, wird eine evtl. vorhandene manuelle Netzwerkkonfiguration in der
<tt>/etc/config/network</tt> &uuml;berschrieben.<br />
Anschlie&szlig;end wird der Router neugestartet.
</td></tr>
</table>
</fieldset>
@ -239,7 +237,7 @@ format_port() {
<%in /www/include/footer %>
<%
# write
if [ "$do_reboot" = "1" ] ; then
reboot
if [ "$do_reconfigure" = "1" ] ; then
configurenetwork
fi
%>

2
src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/settings.html
View File

@ -61,7 +61,7 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
uci -q commit
MSG='<span class="green">Daten gespeichert! - Bitte Router neustarten.</span>'
MSG='<span class="green">Daten gespeichert!</span>'
fi
fi
%>