[PATCH] packages/fff: add new fff-dhcp package

[mail at adrianschmutzler.de]

Hallo,

Acked-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>

Ein paar mögliche Verbesserungen unten.

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of Tim Niemeyer
> Sent: Samstag, 11. August 2018 20:04
> To: franken-dev at freifunk.net
> Subject: Re: [PATCH] packages/fff: add new fff-dhcp package
> 
> Hi
> 
> Hier brauchen wir auch dringend ein Review.
> 
> Tim
> 
> Am Montag, den 12.02.2018, 19:13 +0100 schrieb Tim Niemeyer:
> > Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> > Signed-off-by: Fabian Bläse <fabian at blaese.de>
> > - configure router advertisements
> > - fix package title
> > - remove unnecessary dhcp config on first boot
> >
> > ---
> >
> >  src/packages/fff/fff-dhcp/Makefile                 | 40
> > ++++++++++++++++++++++
> >  .../fff-dhcp/files/etc/uci-defaults/90-fff-dhcp    | 38
> > ++++++++++++++++++++
> >  2 files changed, 78 insertions(+)
> >  create mode 100644 src/packages/fff/fff-dhcp/Makefile
> >  create mode 100644 src/packages/fff/fff-dhcp/files/etc/uci-
> > defaults/90-fff-dhcp
> >
> > diff --git a/src/packages/fff/fff-dhcp/Makefile
> > b/src/packages/fff/fff-dhcp/Makefile
> > new file mode 100644
> > index 0000000..d630412
> > --- /dev/null
> > +++ b/src/packages/fff/fff-dhcp/Makefile
> > @@ -0,0 +1,40 @@
> > +include $(TOPDIR)/rules.mk
> > +
> > +PKG_NAME:=fff-dhcp
> > +PKG_VERSION:=1
> > +PKG_RELEASE:=1
> > +
> > +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-dhcp
> > +
> > +include $(INCLUDE_DIR)/package.mk
> > +
> > +define Package/fff-dhcp

Hier und weiter unten könnte man wieder $PKG_NAME verwenden. Da das aber wohl bei allen GW-Firmware Patches nicht der Fall ist, kann ich das auch am Schluss für alle in einem separaten Patch nachholen (oder sein lassen).

> > +    SECTION:=base
> > +    CATEGORY:=Freifunk
> > +    TITLE:=Freifunk-Franken dhcp
> > +    URL:=http://www.freifunk-franken.de
> > +    DEPENDS:=+dnsmasq
> > +endef
> > +
> > +define Package/fff-dhcp/description
> > +    This is the fff-dhcp for the Freifunk Franken Firmware
> > +    It is used to configure dnsmasq for use as gateway.
> > +endef
> > +
> > +define Build/Prepare
> > +    echo "all: " > $(PKG_BUILD_DIR)/Makefile endef
> > +
> > +define Build/Configure
> > +    # nothing
> > +endef
> > +
> > +define Build/Compile
> > +    # nothing
> > +endef
> > +
> > +define Package/fff-dhcp/install
> > +    $(CP) ./files/* $(1)/
> > +endef
> > +
> > +$(eval $(call BuildPackage,fff-dhcp))
> > diff --git a/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-
> > dhcp b/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp
> > new file mode 100644
> > index 0000000..f4108f7
> > --- /dev/null
> > +++ b/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp
> > @@ -0,0 +1,38 @@
> > +#!/bin/sh
> > +
> > +uci batch <<EOF
> > +  delete dhcp. at dnsmasq[0]
> > +  delete dhcp.lan
> > +  delete dhcp.wan
> > +  add dhcp dnsmasq

Das macht eine Ausgabe. Keine Ahnung, wo die Ausgabe dann hingeschrieben wird und ob man das hier abfangen könnte.

> > +  set dhcp. at dnsmasq[0].domainneeded='0'
> > +  set dhcp. at dnsmasq[0].boguspriv='0'
> > +  set dhcp. at dnsmasq[0].filterwin2k='0'
> > +  set dhcp. at dnsmasq[0].localise_queries='0'
> > +  set dhcp. at dnsmasq[0].rebind_protection='0'
> > +  set dhcp. at dnsmasq[0].rebind_localhost='1'
> > +  set dhcp. at dnsmasq[0].domain='fff.community'
> > +  set dhcp. at dnsmasq[0].expandhosts='0'
> > +  set dhcp. at dnsmasq[0].nonegcache='0'
> > +  set dhcp. at dnsmasq[0].authoritative='1'
> > +  set dhcp. at dnsmasq[0].readethers='1'
> > +  set dhcp. at dnsmasq[0].leasefile='/tmp/dhcp.leases'
> > +  set dhcp. at dnsmasq[0].noresolv='1'
> > +  set dhcp. at dnsmasq[0].localservice='1'
> > +  add_list dhcp. at dnsmasq[0].server='10.50.252.11'
> > +  add_list dhcp. at dnsmasq[0].server='10.50.252.0'
> > +  add_list dhcp. at dnsmasq[0].server='/in-addr.arpa/10.50.252.11'
> > +  add_list dhcp. at dnsmasq[0].server='/in-addr.arpa/10.50.252.0'
> > +  add_list dhcp. at dnsmasq[0].server='/ip6.arpa/10.50.252.11'
> > +  add_list dhcp. at dnsmasq[0].server='/ip6.arpa/10.50.252.0'
> > +
> > +  set dhcp.mesh=dhcp
> > +  set dhcp.mesh.interface='mesh'
> > +  set dhcp.mesh.ra='server'
> > +  set dhcp.mesh.ra_management='0'
> > +  set dhcp.mesh.leasetime='12h'
> > +EOF
> > +
> > +uci commit

Hier würde "uci commit dhcp" ausreichen.

Grüße

Adrian

> > +
> > +exit0