| Message ID | 20160620200521.13883-1-tk+ff@meskal.net |
|---|---|
| State | Accepted, archived |
| Commit | 30bf6965914b946c33293bdc506644a0875cda0f |
| Headers | show |
diff --git a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd index ab96acf..28ae2b5 100644 --- a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd +++ b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd @@ -1,6 +1,7 @@ #!/bin/sh uci batch <<EOF + delete uhttpd.main delete uhttpd.public delete uhttpd.ssl delete uhttpd.px5g @@ -30,5 +31,5 @@ uci batch <<EOF set uhttpd.px5g.commonname='OpenWrt' EOF -uci commit +uci commit uhttpd exit 0
Danke :) Reviewed-by: Christian Dresel <fff@chrisi01.de> mfg Christian On 20.06.2016 22:05, Tobias Klaus wrote: > also fixes noded flashed with "sysupgrade -n" > > Signed-off-by: Tobias Klaus <tk+ff@meskal.net> > --- > src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd > index ab96acf..28ae2b5 100644 > --- a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd > +++ b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd > @@ -1,6 +1,7 @@ > #!/bin/sh > > uci batch <<EOF > + delete uhttpd.main > delete uhttpd.public > delete uhttpd.ssl > delete uhttpd.px5g > @@ -30,5 +31,5 @@ uci batch <<EOF > set uhttpd.px5g.commonname='OpenWrt' > EOF > > -uci commit > +uci commit uhttpd > exit 0
Hi Applied. Am Montag, den 20.06.2016, 23:00 +0200 schrieb Robert: > Hi, > > kleine Anmerkung von mir. Die /etc/uci-defaults werden vom init.d/boot > Skript in einer Subshell gesourced und am Ende kommt ein uci commit: > > for file in $files; do > ( . "./$(basename $file)" ) && rm -f "$file" > done > uci commit > man braucht also keinen shebang und das commit ist dann auch doppelt. Die Anmerkungen scheinen richtig. Ich hab den Patch nun trotzdem mal applied, da er so erstmal einen Bug fixt. Gern kann man das im Nachgang auch nochmal schöner machen. Tim > Robert > > Am 20.06.2016 um 22:06 schrieb Christian Dresel: > > > Danke :) > > > > Reviewed-by: Christian Dresel <fff@chrisi01.de> > > > > mfg > > > > Christian > > > > On 20.06.2016 22:05, Tobias Klaus wrote: > > > also fixes noded flashed with "sysupgrade -n" > > > > > > Signed-off-by: Tobias Klaus <tk+ff@meskal.net> > > > --- > > > src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd > > > index ab96acf..28ae2b5 100644 > > > --- a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd > > > +++ b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd > > > @@ -1,6 +1,7 @@ > > > #!/bin/sh > > > > > > uci batch <<EOF > > > + delete uhttpd.main > > > delete uhttpd.public > > > delete uhttpd.ssl > > > delete uhttpd.px5g > > > @@ -30,5 +31,5 @@ uci batch <<EOF > > > set uhttpd.px5g.commonname='OpenWrt' > > > EOF > > > > > > -uci commit > > > +uci commit uhttpd > > > exit 0 > > > > > > > > -- > franken-dev mailing list > franken-dev@freifunk.net > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
also fixes noded flashed with "sysupgrade -n" Signed-off-by: Tobias Klaus <tk+ff@meskal.net> --- src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)