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

gateway.d: Add script to set wan vlan/interface #88

Closed
fbl wants to merge 1 commits from fbl/firmware:wan into master
pull from: fbl/firmware:wan
merge into: freifunk-franken:master
Conversation 5 Commits 1 Files Changed 2 +23 -1
fbl commented 2021-01-27 11:04:30 +01:00
Owner
Copy Link

Allow setting WAN vlan/interface from gateway config.
A configuration without explicit definition of a WAN interface is
valid at the moment and results in the default configuration from
fff-network being used.

Originally, it was intended to automatically set WAN to vlan 2, if nothing was
specified. As this would break devices, which don't use swconfig for
WAN, the already configured WAN interface is left untouched.

Fixes: #85
Signed-off-by: Fabian Bläse fabian@blaese.de

Allow setting WAN vlan/interface from gateway config. A configuration without explicit definition of a WAN interface is valid at the moment and results in the default configuration from fff-network being used. Originally, it was intended to automatically set WAN to vlan 2, if nothing was specified. As this would break devices, which don't use swconfig for WAN, the already configured WAN interface is left untouched. Fixes: #85 Signed-off-by: Fabian Bläse <fabian@blaese.de>
fbl added the
feature
layer3
 labels 2021-01-27 11:04:37 +01:00
fbl added this to the 20210211-beta milestone 2021-01-27 11:04:40 +01:00
fbl force-pushed wan from 12478d83e5 to a9a495d42a 2021-01-27 11:31:02 +01:00 Compare
fbl commented 2021-01-27 11:31:16 +01:00
Author
Owner
Copy Link

Changes:

  • Bump PKG_RELEASE
Changes: * Bump PKG_RELEASE
ChristianD reviewed 2021-01-27 11:56:20 +01:00
src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-wan Outdated
@ -0,0 +15,4 @@
apply() {
uci commit network
uci commit gateway
ChristianD commented 2021-01-27 11:56:20 +01:00
Member
Copy Link

gateway commit? Weil?
(unten das gleiche nochmal bei revert)

gateway commit? Weil? (unten das gleiche nochmal bei revert)
fbl commented 2021-01-27 11:57:23 +01:00
Author
Owner
Copy Link

Oh shit. Das ist - wie in der Commit Message vermerkt - ein Überrest von dem automatischen setzen auf 2. Das kommt natürlich noch weg.

Danke fürs aufmerksame drübergucken. :-)

Oh shit. Das ist - wie in der Commit Message vermerkt - ein Überrest von dem automatischen setzen auf 2. Das kommt natürlich noch weg. Danke fürs aufmerksame drübergucken. :-)
ChristianD commented 2021-01-27 11:58:55 +01:00
Member
Copy Link

Ich glaub wir haben uns so bisschen darauf geeinigt den Betreff mit dem package anzufangen, also in dem Beispiel:

fff-layer3-config: Add script to set wan vlan/interface

Ich glaub wir haben uns so bisschen darauf geeinigt den Betreff mit dem package anzufangen, also in dem Beispiel: fff-layer3-config: Add script to set wan vlan/interface
👍 1
fbl force-pushed wan from a9a495d42a to ba7073df5a 2021-01-30 23:05:20 +01:00 Compare
fbl commented 2021-01-30 23:05:22 +01:00
Author
Owner
Copy Link

Changes:

  • Add package name to commit title
  • Remove unnecessary gateway commit
  • Rebase to current master
Changes: * Add package name to commit title * Remove unnecessary gateway commit * Rebase to current master
adschm reviewed 2021-01-30 23:40:47 +01:00
src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-wan
@ -0,0 +2,4 @@
BOARD="$(uci get board.model.name)"
. /etc/network.$BOARD
adschm commented 2021-01-30 23:40:47 +01:00
Owner
Copy Link

Hier hätte eine Leerzeile gereicht, aber sei's drumm ...

Hier hätte eine Leerzeile gereicht, aber sei's drumm ...
ChristianD commented 2021-02-02 21:06:40 +01:00
Member
Copy Link
Reviewed-by: Christian Dresel <freifunk@dresel.systems>
``` Reviewed-by: Christian Dresel <freifunk@dresel.systems> ```
ChristianD approved these changes 2021-02-02 21:06:47 +01:00
rohammer approved these changes 2021-02-08 19:38:22 +01:00
rohammer left a comment
Member
Copy Link

Da kann ich mich anschliessen.

Reviewed-by: Robert Langhammer@web.de>
Da kann ich mich anschliessen. ``` Reviewed-by: Robert Langhammer@web.de> ```
adschm commented 2021-02-09 22:46:28 +01:00
Owner
Copy Link

Danke, wird demnächst gemergt.

Danke, wird demnächst gemergt.
adschm closed this pull request 2021-02-09 22:46:28 +01:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
ChristianD
rohammer
Labels
Clear labels   
RFC

   
RFT

   
WIP

   
blocked

   
bsp

touching bsp files or adding devices

  
bug

Something is not working

  
build/scripts/tools

touching buildscript or other tools

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
fixed

Issue that got resolved

  
layer3

only for layer3 FW

  
mantis

Imported from mantis

  
more details required

Reported information is insufficient to debug the issue

  
needs changes

   
node

only for node FW

  
packages/fff

touching our packages

  
rejected

Rejected or won't fix

  
security

   
trivial

simple non-functional changes that are mostly matter of taste

  
upstream

touching upstream version, build or feed patches

No Label
RFC
RFT
WIP
blocked
bsp
bug
build/scripts/tools
duplicate
feature
fixed
layer3
mantis
more details required
needs changes
node
packages/fff
rejected
security
trivial
upstream
Milestone
Clear milestone
No items
No Milestone
20210211-beta
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: freifunk-franken/firmware#88
No description provided.
Delete Branch "fbl/firmware:wan"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?