gluon-mesh-batman-adv: Use own namespace for batman-adv-legacy #1589
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
T-X
changed the title
T-X
changed the title
rotanid
added
the
2. status: blocked
a037b14 batman-adv-legacy: change batctl to legacy namespace 45cf4b5 batman-adv-legacy: change to batman-adv-legacy namespace
Signed-off-by: Linus Lüssing <[email protected]>
batman-adv-legacy now uses its own namespaces. And whether to use v14 or v15 is determined by the routing algorithm specified in the site configuration. Which means both the batman-adv and batman-adv-legacy kernel modules as well as the according glue code provided by gluon-mesh-batman-adv-14 and gluon-mesh-batman-adv-15 can be installed at the same time. Signed-off-by: Linus Lüssing <[email protected]>
The internal batman-adv compat version numbers are just confusing for the user. Instead, let's just name things "batman-adv" when refering to compatibility version 15 and "batman-adv-legacy" when refering to compatibility version 14. Signed-off-by: Linus Lüssing <[email protected]>
With this patch, the gluon-mesh-batman-adv respondd provider determins the compat version through the selected algorithm in /etc/config/batman-adv (BATMAN_IV_LEGACY vs. BATMAN_IV/BATMAN_V) instead of the file previously placed in /lib/gluon/mesh-batman-adv/compat. Also, the kernel module's new namespace (batman_adv -> batman_adv_legacy) is used to determine the module release version. Signed-off-by: Linus Lüssing <[email protected]>
This commit adds a transparent wrapper which depending on the selected batman-adv routing algorithm calls either /usr/sbin/batctl or /usr/sbin/batctl-legacy. Signed-off-by: Linus Lüssing <[email protected]>
…nary path With this patch the batctl wrapper is used to determine the correct batctl binary either for batman-adv or batman-adv-legacy. Signed-off-by: Linus Lüssing <[email protected]>
With this patch the batctl (wrapper) is used to determine which netlink
namespace to use for netlink calls ("batadv" vs. "batadv_legacy").
Signed-off-by: Linus Lüssing <[email protected]>
T-X
force-pushed
the
batman-adv-legacy-namespace
branch
from
0452dfc to
55d49d8
Compare
|
Changelog v2:
|
|
Closing this in favor of #1622. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patchset allows loading and running the mainline batman-adv (compat 15) and the batman-adv-legacy (compat 14) fork simultaneously.
Which module to use is determined via the routing_algo parameter in the site configuration (which is copied to /etc/config/batman-adv on update): If set to BATMAN_IV_LEGACY then the batman-adv-legacy (compat 14) module is used. Otherwise (e.g. BATMAN_IV or BATMAN_V) the mainline batman-adv module is chosen.
Together with the gluon-scheduled-domain-switch package (#1555) this should ease the migration from compat 14 to compat 15 and speed-up the deprecation of batman-adv-legacy.
Note: This pull-request should only be applied after applying freifunk-gluon/batman-adv-legacy#13 and after applying freifunk-gluon/packages#206.