test: case: user_scripts: Add test

Verify that: - Scripts are executed when the service is enabled - Scripts are not enabled when the service is disabled
confd: Add support for running user scripts
2026-07-22 17:23:00 +02:00 · 2024-05-21 22:02:28 +02:00 · 2024-05-21 22:02:28 +02:00
1474 changed files with 19418 additions and 76777 deletions
@@ -1,36 +0,0 @@
-Checklists for Pull Requests and Releases
-=========================================
-
-Maintainer checklists for reviewing pull requests and doing releases.
-
-
-Pull Requests
-------------
-
- - If applicable, is there a readable ChangeLog entry?
- - If any LICENSE file has been updated, has the `.hash` file been updated?
- - If any change to a Finit `.svc` file, does any run/task linger?  
-   I.e., is there a runlevel and/or condition defined to prevent them
-   from running outside of their intended runlevel?
- - If any change to grub or qemu/qeneth setup, has it been tested in GNS3?
-   - If any change to u-boot/buildroot, has it been tested with `<booloader>_defconfig`
- - If any change to logging, have the resulting logs been audited?
-   - Check for duplicate entries, misspellings
-   - Check for sneaky severity changes, e.g., error vs note, error vs warning
- - If new subsystem, or major changes to a subsystem, have the docs been updated?
- - If change to mDNS, has it been tested with netbrowse?
- - If change to `_defconfig`, verify `local.mk` and sync with other archs
-   - Test manually as well, e.g., CLI changes do not have ha regression tests
-   - Build from distclean, or use artifacts built by build servers, for manual tests
-
-
-Releases
--------
-
- - Make at least one -betaN release to verify the GitHub workflow well in time release day
-   - Stuff happens, remember kernelkit/infix#735
- - Make at least one -rcN to flush out any issues in customer repos
-   - Easy to forget adaptations/hacks in customer repos -- may need Infix change/support
- - Ensure the markdown link for the release diff is updated
- - Ensure subrepos are tagged (can be automated, see kernelkit/infix#393)
- - Sync tags for all repo. sync activities
@@ -1,49 +1,25 @@
-Contributing Guidelines
-=======================
+Contributing to Infix
+=====================

-Thank :heart: you for taking the time to read this!
+We welcome any and all help in the form of bug reports, fixes, patches
+to add new features -- *preferably as GitHub pull requests*.

-We welcome any help in the form of bug reports, fixes, or patches to add
-new features.  We *prefer* GitHub pull requests, but are open to other
-forms of collaboration as well.  [Let's talk!][support] :handshake:
+If you are unsure of what to do, or how to implement an idea or bug fix,
+open an issue with `"[RFC]: Unsure if this is a bug ... ?"`, or use the
+[GitHub discussions forum](https://github.com/orgs/kernelkit/discussions).
+Talking about code and problems first is often the best way to get started
+before submitting a pull request.

-If you are unsure how to start implementing an idea or fix:
-
- - :bug: open an issue, there are human friendly templates for _bugs_
-   and _feature requests_ at <https://github.com/kernelkit/infix/issues>
- - :speech_balloon: use the [Q&A Forum][discuss]
- - :technologist: The [Developer's Guide][devguide] is also a useful start
-
-> _Talking about code and problems first is often the best way to get
-> started before submitting a pull request.  We have found it always
-> saves time, yours and ours._
-
-
-:sparkles: General Guidelines
-----------------------------
-
-When submitting bug reports or patches to bugs, please state which
-version the change is made against, what it does, and, more importantly
-*why* -- from your perspective, why is it a bug, why does the code need
-changing in this way.  Start with why.
-
- - :bug: Bug reports need metadata like Infix version or commit hash
- - :adhesive_bandage: Bug fixes also need version, and (preferably) a
-   corresponding issue number for the ChangeLog
- - :new: New features, you need to get approval of the YANG model first!  
-   :speech_balloon: Please use the [Forum][discuss], e.g., category:
-   *Ideas*, or open a :pray: feature request issue
- - :white_check_mark: New features also need new regression tests, this
-   can be basic tests or more complex use-case tests comprising multiple
-   subsystems, see [Testing Changes](#test_tube-testing-changes), below
+When submitting a bug report, patch, or pull request, please start by
+stating the version the change is made against, what it does, *and why*.

 Please take care to ensure you follow the project coding style and the
 commit message format.  If you follow these recommendations you help
-the maintainers and make it easier for them to include your code.
+the maintainer(s) and make it easier for them to include your code.


-:woman_technologist: Coding Style
---------------------------------
+Coding Style
+------------

 Before jumping into code, remember to **document new features** and bug
 fixes.  Both the manual and ChangeLog are in the `doc/` sub-directory
@@ -64,58 +40,23 @@ We expect code contributions for:
 > code!  Legacy takes precedence, and remember, we read code a lot more
 > than write it, so legibility is important.

-The ChangeLog deserves a separate mention:
-
- - Releases are listed in reverse chronological order order, so the
-   latest/next release is at the beginning of the file
- - Only *user-facing bugs and features* are detailed, so code refactor,
-   new tests, etc. are not listed.
- - Add your changes/features to the Changes section
- - Add your Fix line in the Fixes section, in numeric order 
- - Changes and fixes without an issue number are listed after all
-   numbered ones
- - YANG model changes are documented in their respective model, for
-   standard models, e.g., for `ietf-interfaces.yang`, the corresponding
-   `infix-interfaces.yang` detail augments/deviations as revisions.
-
-A final note, lines of code are allowed to be longer than 72 characters
-these days, unless you live by PEP-8 (see above).  There is no enforced
-maximum, but the team usually keep it around 100 characters for both C
-and Python.
+As a final note, lines are allowed to be longer than 72 characters these
+days.  There is no enforced maximum, but the team usually keep it around
+100 characters for both C and Python.


-:test_tube: Testing Changes
---------------------------
-
-Please test your changes, no matter how trivial or obviously correct
-they may seem.  Nobody is infallible, making mistakes is only human.
-It is also the best insurance policy for your feature, it ensures your
-use-case will remain functional as the source base evolves.
-
-For new functionality we expect new regression tests to be added in
-the same pull request.
-
-For help getting started with testing, see the following resources:
-
- - [Developer's Guide][devguide]
- - [Regression Testing][testing]
-
-
-:memo: Commit Messages
----------------------
+Commit Messages
+---------------

 Commit messages exist to track *why* a change was made.  Try to be as
 clear and concise as possible in your commit messages, and always, be
 proud of your work and set up a proper GIT identity for your commits:

-<img src="../doc/jack.png" width=70 align="right">
-
    $ git config --global user.name "Jacky Linker"
    $ git config --global user.email jacky.linker@example.com

-Example commit message from one of many [online guides][cbeams].  Use
-`git commit -s` to automatically add a `Signed-off-by` for proof of
-origin, see [DCO][] for more info.
+Example commit message from the [Pro Git][gitbook] online book, notice
+how `git commit -s` is used to automatically add a `Signed-off-by`:

    subsystem: brief, but clear and concise summary of changes
    
@@ -132,58 +73,20 @@ origin, see [DCO][] for more info.
     - Typically a hyphen or asterisk is used for the bullet, preceded
       by a single space, with blank lines in between, but conventions
       vary here
-
-	If you use an issue tracker, put references to them at the bottom,
-	like this:
-
-	Resolves: #123
-	See also: #456, #789
-
+    
    Signed-off-by: Jacky Linker <jacky.linker@example.com>

-This is an example of how to [automatically close][closing] an issue
-when the commit is merged to mainline.  Several keywords are available.

-
-:twisted_rightwards_arrows: Pull Requests
-----------------------------------------
-
-> _The git repository is the canonical location for information._
-
-A pull request should preferably address a single issue or change.  This
-may of course include multiple related changes, but what is important to
-remember is the bandwidth of the maintainers.  A smaller well documented
-PR is more likely to get attention quicker in some reviewer's busy day.
-
-Well documented here means that each commit message stands on its own,
-telling the complete story of the change.  In fact each commit should,
-as much as possible, be independent of other changes.  This is very
-important, not only when digging though logs to understand why a piece
-of code exists, but also when bisecting a problem -- each single commit
-should also compile and be possible to run.
-
-If you've worked on projects that send patches, like the Linux kernel or
-Buildroot, consider the pull request message body similar to the cover
-letter for a series of patches -- it's a summary of changes, and it is
-lost when the changes are merged to the mainline branch.
-
-
-:balance_scale: Code of Conduct
-------------------------------
+Code of Conduct
+---------------

 It is expected of everyone to respect the [Code of Conduct][conduct].
 The *"maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, discussion forum threads, issues, and
 other contributions that are not aligned to this Code of Conduct."*

-[support]:  https://github.com/kernelkit/infix/blob/main/.github/SUPPORT.md
-[discuss]:  https://github.com/orgs/kernelkit/discussions
-[testing]:  https://github.com/kernelkit/infix/blob/main/doc/testing.md
-[devguide]: https://github.com/kernelkit/infix/blob/main/doc/developers-guide.md
-[Linux]:    https://www.kernel.org/doc/html/v6.9/process/coding-style.html
-[PEP-8]:    https://peps.python.org/pep-0008/
-[RDD]:      https://tom.preston-werner.com/2010/08/23/readme-driven-development
-[cbeams]:   https://cbea.ms/git-commit/#seven-rules
-[conduct]:  CODE-OF-CONDUCT.md
-[DCO]:      https://developercertificate.org/
-[closing]:  https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests
+[Linux]:   https://www.kernel.org/doc/html/v6.9/process/coding-style.html
+[PEP-8]:   https://peps.python.org/pep-0008/
+[RDD]:     https://tom.preston-werner.com/2010/08/23/readme-driven-development
+[gitbook]: https://git-scm.com/book/ch5-2.html
+[conduct]: CODE-OF-CONDUCT.md
@@ -1,26 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-If you discover a security vulnerability in Infix, please use GitHub's built-in
-[Report a Vulnerability](https://github.com/kernelkit/infix/security/advisories/new)
-feature for a private and secure disclosure.
-
-When reporting, include:
-
- A clear description of the vulnerability.
- Steps to reproduce the issue.
- Potential impact of the vulnerability.
-
-## Supported Versions
-
-We provide security updates only for the main branch.
-
-Individual support contracts are provided by _Wires_. See
-[Support](https://github.com/kernelkit/infix/blob/main/.github/SUPPORT.md)
-for more information.
-
-## Acknowledgments
-
-We appreciate the efforts of the security community to help improve the security
-of Infix. Thank you for your responsible disclosure.
@@ -1,12 +1 @@
-Limited free support is only available using the online resources of the
-project on GitHub, and Discord, see <https://github.com/kernelkit>:
-
-&nbsp;&nbsp; :speech_balloon: <https://github.com/orgs/kernelkit/discussions>  
-&nbsp;&nbsp; :bug: <https://github.com/kernelkit/infix/issues>
-
-Support contracts, development of new features, fast-tracking of reviews
-and contributions, customer branding of Infix, and even customer specific
-features for dedicated products is provided by _Wires_.
-
-&nbsp;&nbsp; :globe_with_meridians: <https://www.wires.se>  
-&nbsp;&nbsp; :e-mail: <mailto:infix@wires.se>
+Paid support and development provided by Addiva Elektronik <https://addiva.se>
@@ -5,6 +5,12 @@
  -- Remember: assign a reviewer, or use @mentions if org. member.
  -->

+
+## Other information
+
+<!-- Other relevant info, e.g., before/after screenshots -->
+
+
 ## Checklist

 Tick *relevant* boxes, this PR is-a or has-a:
@@ -17,12 +23,9 @@ Tick *relevant* boxes, this PR is-a or has-a:
  - [ ] Regression tests added?
  - [ ] ChangeLog updates (for next release)
  - [ ] Documentation added?
- [ ] Test changes
-  - [ ] Checked in changed Readme.adoc (make test-spec)
-  - [ ] Added new test to group Readme.adoc and yaml file
 - [ ] Code style update (formatting, renaming)
 - [ ] Refactoring (please detail in commit messages)
 - [ ] Build related changes
 - [ ] Documentation content changes
-  - [ ] ChangeLog updated (for major changes)
 - [ ] Other (please describe):
+
@@ -1,16 +0,0 @@
-name: Adds all issues to project Infix & C:o
-
-on:
-  issues:
-    types:
-      - opened
-
-jobs:
-  add-to-project:
-    name: Add issue to project Infix&co
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v1.0.2
-        with:
-          project-url: https://github.com/orgs/kernelkit/projects/3
-          github-token: ${{ secrets.ADD_TO_PROJECT }}
@@ -1,18 +1,10 @@
 name: Bob the Builder

 on:
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
  push:
    branches:
      - main
  workflow_dispatch:
-    inputs:
-      minimal:
-        description: 'Build minimal defconfigs'
-        required: false
-        default: true
-        type: boolean

 jobs:
  build:
@@ -22,55 +14,19 @@ jobs:
      matrix:
        target: [aarch64, x86_64]
      fail-fast: false
-    outputs:
-      build_id: ${{ steps.vars.outputs.INFIX_BUILD_ID }}
    steps:
-      - name: Cleanup Build Folder
-        run: |
-          ls -la ./
-          rm -rf ./* || true
-          rm -rf ./.??* || true
-          ls -la ./
-
      - uses: actions/checkout@v4
        with:
          clean: true
-          fetch-depth: 0
          submodules: recursive

      - name: Set Build Variables
        id: vars
        run: |
-          if [ -n "${{ github.event.pull_request.head.sha }}" ]; then
-              # Since PRs are built from an internally generated merge
-              # commit, reverse lookups of PRs and/or commits from
-              # image version information are cumbersome.  Therefore:
-              # explicitly set a build id that references both the PR
-              # and the commit.
-              printf "INFIX_BUILD_ID=pr%d.%.7s\n" \
-                  "${{ github.event.number }}" "${{ github.event.pull_request.head.sha }}" \
-                  | tee -a $GITHUB_OUTPUT $GITHUB_ENV
-          fi
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-              if [ "${{ github.event.inputs.minimal }}" == "true" ]; then
-                  flavor="_minimal"
-              fi
-          else
-              # Ensure 'release' job get the proper image when building main
-              if [ "$GITHUB_REF_NAME" != "main" ]; then
-                  flavor="_minimal"
-              else
-                  flavor=""
-              fi
-              if ${{ contains(github.event.pull_request.labels.*.name, 'ci:main') }}; then
-                  flavor=""
-              fi
-          fi
          target=${{ matrix.target }}
          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
-          echo "flv=$flavor"              >> $GITHUB_OUTPUT
-          echo "Building target ${target}${flavor}_defconfig"
+
      - name: Restore Cache of dl/
        uses: actions/cache@v4
        with:
@@ -88,123 +44,35 @@ jobs:
            ccache-${{ matrix.target }}-
            ccache-

-      - name: Configure ${{ matrix.target }}${{ steps.vars.outputs.flv }}
+      - name: Configure & Build
        run: |
-          make ${{ matrix.target }}${{ steps.vars.outputs.flv }}_defconfig
-
-      - name: Unit Test ${{ matrix.target }}
-        run: |
-          make test-unit
-
-      - name: Build ${{ matrix.target }}${{ steps.vars.outputs.flv }}
-        run: |
-          echo "Building ${{ matrix.target }}${{ steps.vars.outputs.flv }}_defconfig ..."
+          target=${{ matrix.target }}_defconfig
+          echo "Building $target ..."
+          make $target
          make

-      - name:  Check SBOM from Build
-        run: |
-          make legal-info
-
-      - name: Build test specification
-        run: |
-          make test-spec
-
-      - name: Resulting size of build
-        run: |
-          printf "Size of complete tree : "
-          du -sh .
-          printf "Size of output/       : "
-          du -sh output
-          printf "Size of dl/           : "
-          du -sh dl
-          printf "Size of output/images/: "
-          ls -l output/images/
-
-      - name: Prepare ${{ matrix.target }} Artifact
+      - name: Prepare Artifact
        run: |
          cd output/
          mv images ${{ steps.vars.outputs.dir }}
          ln -s ${{ steps.vars.outputs.dir }} images
-          tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+          tar chfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+
+      - name: Test
+        if: matrix.target == 'x86_64'
+        run: |
+          make test

      - uses: actions/upload-artifact@v4
        with:
          path: output/${{ steps.vars.outputs.tgz }}
          name: artifact-${{ matrix.target }}

-  test:
-    name: Regression Test of Infix x86_64
-    needs: build
-    runs-on: [ self-hosted, regression ]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          clean: true
-          submodules: recursive
-
-      - name: Set Build Variables
-        id: vars
-        run: |
-          if [ -n "${{ needs.build.outputs.build_id }}" ]; then
-              echo "INFIX_BUILD_ID=${{ needs.build.outputs.build_id }}" \
-                   >>$GITHUB_ENV
-          fi
-
-          if [ "$GITHUB_REF_NAME" != "main" ]; then
-              flavor="_minimal"
-          else
-              flavor=""
-          fi
-          echo "flv=$flavor"              >> $GITHUB_OUTPUT
-
-      - name: Configure x86_64${{ steps.vars.outputs.flv }}
-        run: |
-          make x86_64${{ steps.vars.outputs.flv }}_defconfig
-
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: "artifact-*"
-          merge-multiple: true
-
-      - name: Restore x86-64${{ steps.vars.outputs.flv }} output/
-        run: |
-          ls -l
-          mkdir -p output
-          mv infix-x86_64.tar.gz output/
-          cd output/
-          tar xf infix-x86_64.tar.gz
-          ln -s infix-x86_64 images
-
-      - name: Regression Test x86_64${{ steps.vars.outputs.flv }}
-        run: |
-          make test
-
-      - name: Publish Test Result for x86_64${{ steps.vars.outputs.flv }}
-        # Ensure this runs even if Regression Test fails
-        if: always()
-        run: cat test/.log/last/result-gh.md >> $GITHUB_STEP_SUMMARY
-
-      - name: Generate Test Report for x86_64${{ steps.vars.outputs.flv }}
-        # Ensure this runs even if Regression Test fails
-        if: always()
-        run: |
-          asciidoctor-pdf \
-          --theme test/9pm/report/theme.yml \
-          -a pdf-fontsdir=test/9pm/report/fonts \
-          test/.log/last/report.adoc \
-          -o test/.log/last/report.pdf
-
-      - name: Upload Test Report as Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-report
-          path: test/.log/last/report.pdf
-
  release:
    if: ${{github.repository_owner == 'kernelkit' && github.ref_name == 'main'}}
    name: Upload Latest Build
-    needs: test
-    runs-on: ubuntu-latest
+    needs: build
+    runs-on: [ self-hosted, latest ]
    permissions:
      contents: write
    steps:
@@ -213,12 +81,6 @@ jobs:
          pattern: "artifact-*"
          merge-multiple: true

-      - name: Create checksums ...
-        run: |
-          for file in *.tar.gz; do
-              sha256sum $file > $file.sha256
-          done
-
      - uses: ncipollo/release-action@v1
        with:
          allowUpdates: true
@@ -228,13 +90,13 @@ jobs:
          prerelease: true
          tag: "latest"
          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "*.tar.gz*"
+          artifacts: "*.tar.gz"

      - name: Summary
        run: |
          cat <<EOF >> $GITHUB_STEP_SUMMARY
          # Latest Build Complete! :rocket:
-
+          
          For the public download links of these build artifacts, please see:
           <https://github.com/kernelkit/infix/releases/tag/latest>
          EOF
@@ -2,7 +2,7 @@ name: Coverity Scan

 on:
  schedule:
-    - cron: '5 0 * * 6'
+    - cron: '5 0 * * *'
  workflow_dispatch:

 env:
@@ -54,8 +54,8 @@ jobs:
        run: |
          sudo apt-get -y update
          sudo apt-get -y install pkg-config libjansson-dev libev-dev \
-                       libcrypt-dev libglib2.0-dev libpcre2-dev       \
-                       libuev-dev
+                       libaugeas-dev libglib2.0-dev libpcre2-dev      \
+                       libuev-dev libite-dev

      - name: Build dependencies
        run: |
@@ -65,8 +65,6 @@ jobs:
          git clone https://github.com/sysrepo/sysrepo.git
          mkdir sysrepo/build
          (cd sysrepo/build && cmake .. && make all && sudo make install)
-          git clone https://github.com/troglobit/libite.git
-          (cd libite && ./autogen.sh && ./configure && make && sudo make install)
          make dep

      - name: Check applications
@@ -0,0 +1,94 @@
+name: Reggie Regression
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Regression Testing ${{ matrix.target }}
+    runs-on: [ self-hosted, regression ]
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    strategy:
+      matrix:
+        target: [aarch64, x86_64]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          clean: true
+          submodules: recursive
+
+      - name: Clean up cruft ...
+        run: |
+          ./test/env -c
+
+      - name: Set Build Variables
+        id: vars
+        run: |
+          target=${{ matrix.target }}
+          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
+          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
+
+      - name: Restore Cache of dl/
+        uses: actions/cache@v4
+        with:
+          path: dl/
+          key: dl-netconf-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
+          restore-keys: |
+            dl-
+
+      - name: Restore Cache of .ccache/
+        uses: actions/cache@v4
+        with:
+          path: .ccache/
+          key: ccache-x86_64-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          restore-keys: |
+            ccache-${{ matrix.target }}-
+            ccache-
+
+      - name: Configure ${{ matrix.target }}
+        run: |
+          target=${{ matrix.target }}_defconfig
+          echo "Building $target ..."
+          make $target
+
+      - name: Unit Test
+        run: |
+          make test-unit
+
+      - name: Build
+        run: |
+          make
+
+      - name: Prepare Artifact
+        run: |
+          cd output/
+          mv images ${{ steps.vars.outputs.dir }}
+          ln -s ${{ steps.vars.outputs.dir }} images
+          tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: output/${{ steps.vars.outputs.tgz }}
+          name: artifact-${{ matrix.target }}
+
+      - name: Regression Test
+        if: matrix.target == 'x86_64'
+        run: |
+          make test
+
+      - name: Publish Test Result
+        # Ensure this runs even if Regression Test fails
+        if: always()
+        run: cat test/.log/last/result-gh.md >> $GITHUB_STEP_SUMMARY
@@ -76,19 +76,15 @@ jobs:
        run: |
          make legal-info

-      - name: Build test specification
-        run: |
-          make test-spec
-
      - name: Prepare Artifacts
        run: |
          cd output/
          mv images ${{ steps.vars.outputs.dir }}
          ln -s ${{ steps.vars.outputs.dir }} images
-          tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+          tar chfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}

-          mv legal-info legal-info-${{ matrix.target }}-${{ steps.vars.outputs.ver }}
-          tar cfz legal-info-${{ matrix.target }}-${{ steps.vars.outputs.ver }}.tar.gz legal-info-${{ matrix.target }}-${{ steps.vars.outputs.ver }}
+          mv legal-info legal-info-$target
+          tar chfz legal-info-$target.tar.gz legal-info-$target

      - uses: actions/upload-artifact@v4
        with:
@@ -101,7 +97,6 @@ jobs:
    runs-on: [ self-hosted, release ]
    permissions:
      contents: write
-      discussions: write
    steps:
      - uses: actions/checkout@v4
        with:
@@ -116,14 +111,12 @@ jobs:
              ver=${GITHUB_REF#refs/tags/}
          fi
          echo "ver=${ver}"     >> $GITHUB_OUTPUT
-          echo "cat="           >> $GITHUB_OUTPUT
          if echo $ver | grep -qE 'v[0-9.]+(-alpha|-beta|-rc)[0-9]*'; then
            echo "pre=true"     >> $GITHUB_OUTPUT
            echo "latest=false" >> $GITHUB_OUTPUT
          elif echo $ver | grep -qE '^v[0-9.]+\.[0-9.]+(\.[0-9]+)?$'; then
            echo "pre=false"    >> $GITHUB_OUTPUT
            echo "latest=true"  >> $GITHUB_OUTPUT
-            echo "cat=Releases" >> $GITHUB_OUTPUT
          else
            echo "pre=false"    >> $GITHUB_OUTPUT
            echo "latest=false" >> $GITHUB_OUTPUT
@@ -153,7 +146,6 @@ jobs:
          name: Infix ${{ github.ref_name }}
          prerelease: ${{ steps.rel.outputs.pre }}
          makeLatest: ${{ steps.rel.outputs.latest }}
-          discussionCategory: ${{ steps.rel.outputs.cat }}
          bodyFile:  release.md
          artifacts: "*.tar.gz*"

@@ -161,7 +153,7 @@ jobs:
        run: |
          cat <<EOF >> $GITHUB_STEP_SUMMARY
          # Infix ${{ github.ref_name }} Released! :rocket:
-
+          
          For the public download links of this release, please see:
           <https://github.com/kernelkit/infix/releases/tag/${{ github.ref_name }}>
          EOF
@@ -0,0 +1,28 @@
+# To enable automatic sync of your Infix fork every day, or on dispatch,
+# set the repoistory or organisation variable (not secret):
+#
+#     SYNC_FORK = true
+#
+# You also need a GH_SYNC_REPO token allowed to update workflows.  For
+# more information on variables and secrets, see the GitHub docs.
+# See https://docs.github.com/en/actions/learn-github-actions/variables
+name: Synchronize your fork of Infix with upstream
+
+on:
+  schedule:
+    - cron: 42 2 * * *
+  workflow_dispatch:
+
+jobs:
+  sync_fork:
+    if: ${{github.repository_owner != 'kernelkit' && vars.SYNC_FORK == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: TobKed/github-forks-sync-action@master
+        with:
+          github_token: ${{ secrets.GH_SYNC_REPO }}
+          upstream_repository: KernelKit/infix
+          upstream_branch: main
+          target_branch: main
+          force: false
+          tags: true
@@ -8,4 +8,3 @@
 /test/.venv
 /test/.log
 /local.mk
-/test/spec/Readme.adoc
@@ -52,17 +52,6 @@ config INFIX_IMAGE_ID
 	  Mandatory.  When INFIX_RELEASE is set, this string is appended to
 	  the IMAGE_ID with a '-' separator.

-config INFIX_COMPATIBLE
-	string "Operating system compatible string"
-	default "${INFIX_IMAGE_ID}"
-	help
-	  A lower-case string (no spaces or other characters outside of 0–9,
-	  a–z, ".", "_" and "-"), used for image identification at upgrade.
-	  E.g., the RAUC [system] compatible string.
-
-	  Mandatory.  Defaults to $INFIX_IMAGE_ID, which in turn is composed
-	  of $INFIX_ID-$BR2_ARCH.
-
 config INFIX_TAGLINE
 	string "Operating system tagline"
 	default "Infix -- a Network Operating System"
@@ -123,6 +112,10 @@ config INFIX_ARCH
 	default "riscv64" if BR2_riscv
 	default "x86_64"  if BR2_x86_64

+menu "Packages"
+
 source "$BR2_EXTERNAL_INFIX_PATH/package/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/Config.in.host"
+
+endmenu
+
 source "$BR2_EXTERNAL_INFIX_PATH/board/common/Config.in"
@@ -1,13 +1,8 @@
-export BR2_EXTERNAL ?= $(CURDIR)
+export BR2_EXTERNAL := $(CURDIR)
 export PATH         := $(CURDIR)/bin:$(PATH)

 ARCH ?= $(shell uname -m)
-O    ?= output
-
-# If a relative output path is specified, we have to translate it to
-# an absolute one before handing over control to Buildroot, which will
-# otherwise treat it as relative to ./buildroot.
-override O := $(if $(filter /%,$O),$O,$(CURDIR)/$O)
+O    ?= $(CURDIR)/output

 config := $(O)/.config
 bmake   = $(MAKE) -C buildroot O=$(O) $1
@@ -5,8 +5,8 @@
 Infix is a free, Linux based, immutable Network Operating System (NOS)
 built on [Buildroot][1], and [sysrepo][2].  A powerful mix that ease
 porting to different platforms, simplify long-term maintenance, and
-provide made-easy management using NETCONF, RESTCONF[^2], or the
-built-in command line interface (CLI) from a console or SSH login.
+provide made-easy management using NETCONF[^1] or the built-in command
+line interface (CLI) from a console or SSH login.

 > Click the **▶ Example CLI Session** foldout below for an example, or
 > head on over to the [Infix Documentation](doc/README.md) for more
@@ -22,18 +22,18 @@ may be appealing for other use-cases as well:
 - Atomic upgrades to secondary partition
 - Highly security focused

-An immutable[^1] operating system enhances security and inherently makes
+An immutable[^2] operating system enhances security and inherently makes
 it maintenance-free.  Configuration and data, e.g, containers, is stored
 on separate partitions to ensure complete separation from system files
 and allow for seamless backup, restore, and provisioning.

-In itself, Infix is perfectly suited for dedicated networking tasks, and
-with native support for Docker containers, the operating system provides
-a versatile platform that can easily be adapted to any customer need.
-Be it legacy applications, network protocols, process monitoring, or
-edge data analysis, it can run close to end equipment.  Either directly
-connected on dedicated Ethernet ports or indirectly using virtual
-network cables to exist on the same LAN as other connected equipment.
+In itself Infix is perfectly suited for dedicated networking tasks and
+native support for Docker containers provides a versatile platform that
+can easily be adapted to any customer need.  Be it legacy applications,
+network protocols, process monitoring, or edge data analysis, it can run
+close to end equipment.  Either directly connected on dedicated Ethernet
+ports or indirectly using virtual network cables to exist on the same
+LAN as other connected equipment.

 The simple design of Infix provides complete control over both system
 and data, minimal cognitive burden, and makes it incredibly easy to get
@@ -93,7 +93,6 @@ The [following boards](board/aarch64/README.md) are fully supported:
 - Marvell CN9130 CRB
 - Marvell EspressoBIN
 - Microchip SparX-5i PCB135 (eMMC)
- - StarFive VisionFive2
 - NanoPi R2S

 An x86_64 build is also available, primarily intended for development
@@ -106,25 +105,14 @@ more information, see: [Infix in Virtual Environments](doc/virtual.md).
 >
 > For *customer specific builds* of Infix, see your product repository.

+[^1]: NETCONF or RESTCONF, <https://datatracker.ietf.org/doc/html/rfc8040>

----
-
-<div align="center">
-  <a href="https://github.com/wires-se"><img src="https://raw.githubusercontent.com/wires-se/.github/main/profile/logo.png" width=300></a>
-  <br />Infix development is sponsored by <a href="https://wires.se">Wires<a>
-</div>
-
----
-
-[^1]: An immutable operating system is one with read-only file systems,
+[^2]: An immutable operating system is one with read-only file systems,
    atomic updates, rollbacks, declarative configuration, and workload
    isolation.  All to improve reliability, scalability, and security.
    For more information, see <https://ceur-ws.org/Vol-3386/paper9.pdf>
    and <https://www.zdnet.com/article/what-is-immutable-linux-heres-why-youd-run-an-immutable-linux-distro/>.

-[^2]: Partial RESTCONF support, features like HTTP PATCH, OPTIONS, HEAD,
-    and copying between datastores are still missing.
-
 [1]: https://buildroot.org/
 [2]: https://www.sysrepo.org/
 [3]: doc/cli/introduction.md
@@ -3,7 +3,5 @@ aarch64

 Board Specific Documentation
 ----------------------------
-
 - [Marvell CN9130-CRB](cn9130-crb/)
 - [Microchip SparX-5i PCB135 (eMMC)](sparx5-pcb135/)
- [NanoPi R2S](r2s/)
@@ -118,8 +118,8 @@ the device is reasonably correct, and run the provisioning script:

    admin@infix:~$ sudo -i
    root@infix:~$ udhcpc -i e28
-    root@infix:~$ date -us YYYY-MM-DD
-    root@infix:~$ /usr/libexec/infix/prod/provision tftp://<PC-IP>/infix-aarch64.pkg /dev/mmcblk0
+	root@infix:~$ date -us YYYY-MM-DD
+	root@infix:~$ /libexec/infix/prod/provision tftp://<PC-IP>/infix-aarch64.pkg /dev/mmcblk0

 After successful completion, the device is fully provisioned. On the
 next boot, the device will boot of its own accord from the primary
@@ -128,9 +128,5 @@ SD-card partition.
 > If possible, serve `infix-aarch64.pkg` over HTTP instead, as
 > libcurl's TFTP implementation is quite slow.

-## Console Port
-
-The console port runs at 115200 baud, 8N1.
-
 [release]: https://github.com/kernelkit/infix/releases
 [mvebu64boot]: https://github.com/addiva-elektronik/mvebu64boot
@@ -16,12 +16,7 @@ run ixboot
 ";
 			boot_targets = "mmc1";
 			ethprime = "eth1";
-
-			/* This is a development platform, keep
-			 * developer mode statically enabled.
-			 */
-			ixbtn-devmode = "setenv dev_mode yes; echo Enabled";
-			ixbtn-factory = "echo \"No button available, use bootmenu\"";
+			bootdelay = "1";
 		};
 	};
 };
@@ -3,7 +3,7 @@
 * Copyright (C) 2020 Marvell International Ltd.
 */

-#include "arm64/marvell/cn9130-crb.dtsi"
+#include "cn9130-crb.dtsi"

 / {
 	model = "Marvell Armada CN9130-CRB-A";
@@ -1,4 +1,4 @@
-#include <arm64/marvell/cn9130.dtsi>
+#include "cn9130.dtsi"

 &cp0_syscon0 {
 	cp0_pinctrl: pinctrl {
@@ -5,7 +5,7 @@
 */

 /dts-v1/;
-#include <arm64/microchip/sparx5_pcb135_emmc.dts>
+#include "sparx5_pcb135_emmc.dts"

 &cpu0 {
 	enable-method = "spin-table";
@@ -1,5 +1,5 @@
-#ifndef _DCP_SC_28P_MPP_H
-#define _DCP_SC_28P_MPP_H
+#ifndef _STYX_MPP_H
+#define _STYX_MPP_H

 #define SFP0_TX_DISABLE(X) X( "mpp0", cp0_gpio1,  0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)
 #define SFP1_TX_DISABLE(X) X( "mpp1", cp0_gpio1,  1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)
@@ -73,4 +73,4 @@
 #define MPP_GPIO_REF_NO_CHIP(_mpp, _chip, _no, _flags) <_no (_flags)>
 #define MPP_IRQ_REF(_mpp, _chip, _no, _flags) <&_chip _no (_flags)>

-#endif	/* _DCP_SC_28P_MPP_H */
+#endif	/* _STYX_MPP_H */
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2021 Marvell International Ltd.
+ * Copyright (C) 2023 Addiva Elektronik AB
+ *
+ * Device tree for Styx board
+ */
+
+#include "styx.dtsi"
@@ -3,7 +3,7 @@
 * Copyright (C) 2021 Marvell International Ltd.
 * Copyright (C) 2023 Addiva Elektronik AB
 *
- * Device tree base for DCP-SC-28P
+ * Device tree for Styx board
 */

 #include <dt-bindings/input/input.h>
@@ -12,10 +12,13 @@

 #include "../marvell/cn9130-patched.dtsi"

-#include "dcp-sc-28p-mpp.h"
+#include "styx-mpp.h"

 / {
-	model = "DCP-SC-28P";
+	model = "Styx";
+	compatible = "styx,styx",
+		"marvell,armada-ap807-quad",
+		"marvell,armada-ap807";

 	chosen {
 		stdout-path = "serial0:115200n8";
@@ -33,14 +36,6 @@
 	};
 };

-/*
- * RTC has no valid bit, and this board does not connect any
- * backup power (e.g. supercap) to it, so it returns garbage
- * after every cold reset.
- */
-&cp0_rtc {
-	status = "disabled";
-};

 /* UART0 (Console) */

@@ -97,7 +92,7 @@
 		compatible = "atmel,24c256";
                reg = <0x50>;

-		infix,board = "product";
+		infix,board = "cpu";
 		infix,trusted;

 		nvmem-layout {
@@ -265,43 +260,25 @@
 	};
 };

-#define SWP_LED \
+#define SWP_LED(_func) \
 	leds { \
 		#address-cells = <1>; \
 		#size-cells = <0>; \
 		\
 		led@0 { \
 			reg = <0>; \
-			function = "tp"; \
+			function = _func; \
 			color = <LED_COLOR_ID_GREEN>; \
 			default-state = "keep"; \
 		}; \
 		led@1 { \
 			reg = <1>; \
-			function = "aux"; \
-			color = <LED_COLOR_ID_GREEN>; \
+			function = _func; \
+			color = <LED_COLOR_ID_YELLOW>; \
 			default-state = "off"; \
 		}; \
 	}

-/* SFP LEDs
- * Rev A. LEDs do not work at all
- * Rev B. only outer-most (green) LEDs work
- */
-
-#define SFP_LED \
-	leds { \
-		#address-cells = <1>; \
-		#size-cells = <0>; \
-		\
-		led@0 { \
-			reg = <0>; \
-			function = "sfp"; \
-			color = <LED_COLOR_ID_GREEN>; \
-			default-state = "keep"; \
-		}; \
-	}
-
 #define XSWP(_n, _label, _mac_offs, _sfp) \
 	port@_n { \
 		reg = <0x ## _n>; \
@@ -310,31 +287,8 @@
 		nvmem-cell-names = "mac-address"; \
 		phy-mode = "10gbase-r"; \
 		managed = "in-band-status"; \
-		sfp = <_sfp>; \
-		SFP_LED; \
-	}
-
-#define XSWCPU(_n, _eth) \
-	port@_n { \
-		reg = <0x ## _n>; \
-		label = "cpu"; \
-		ethernet = <_eth>; \
-		phy-mode = "10gbase-r"; \
-		fixed-link { \
-			speed = <10000>; \
-			full-duplex; \
-		}; \
-	}
-
-#define XSWLINK(_n, _link) \
-	port@_n { \
-		reg = <0x ## _n>; \
-		link = <_link>; \
-		phy-mode = "10gbase-r"; \
-		fixed-link { \
-			speed = <10000>; \
-			full-duplex; \
-		}; \
+		sfp = <&_sfp>; \
+		SWP_LED("sfp"); \
 	}

 #define GSWP(_n, _label, _mac_offs, _phy) \
@@ -344,8 +298,8 @@
 		nvmem-cells = <&base_mac _mac_offs>; \
 		nvmem-cell-names = "mac-address"; \
 		phy-mode = "gmii"; \
-		phy-handle = <_phy>; \
-		SWP_LED; \
+		phy-handle = <&_phy>; \
+		SWP_LED("tp"); \
 	}

 #define GPHY(_n) \
@@ -378,14 +332,52 @@
 			#address-cells = <1>;
 			#size-cells = <0>;

-			GSWP(1,  "e22", 22, &sw3phy1);
-			GSWP(2,  "e21", 21, &sw3phy2);
-			GSWP(3,  "e24", 24, &sw3phy3);
-			GSWP(4,  "e23", 23, &sw3phy4);
-			GSWP(5,  "e26", 26, &sw3phy5);
-			GSWP(6,  "e25", 25, &sw3phy6);
-			GSWP(7,  "e28", 28, &sw3phy7);
-			GSWP(8,  "e27", 27, &sw3phy8);
+			port@9 {
+				reg = <0x9>;
+				label = "cpu";
+				ethernet = <&cp0_eth0>;
+				phy-mode = "10gbase-r";
+				fixed-link {
+					speed = <10000>;
+					full-duplex;
+				};
+			};
+
+			sw3p10: port@a {
+				reg = <0xa>;
+				link = <&sw2p10 &sw1p0>;
+				phy-mode = "10gbase-r";
+				fixed-link {
+					speed = <10000>;
+					full-duplex;
+				};
+			};
+
+			/* Can't use XSWP macro as port 0 does not have
+			 * any LEDs attached to it. LEDs for port 10 seem
+			 * to be wired to the corresponding SFP cage. Maybe
+			 * we can apply a static workaround by binding port
+			 * 10's green LED to "Special LED 1", so we can at
+			 * least see link/act.
+			 */
+			port@0 {
+				reg = <0>;
+				label = "e16";
+				nvmem-cells = <&base_mac 16>;
+				nvmem-cell-names = "mac-address";
+				phy-mode = "10gbase-r";
+				managed = "in-band-status";
+				sfp = <&sfp3>;
+			};
+
+			GSWP(1,  "e22", 22, sw3phy1);
+			GSWP(2,  "e21", 21, sw3phy2);
+			GSWP(3,  "e24", 24, sw3phy3);
+			GSWP(4,  "e23", 23, sw3phy4);
+			GSWP(5,  "e26", 26, sw3phy5);
+			GSWP(6,  "e25", 25, sw3phy6);
+			GSWP(7,  "e28", 28, sw3phy7);
+			GSWP(8,  "e27", 27, sw3phy8);
 		};

 		mdio {
@@ -420,14 +412,36 @@
 			#address-cells = <1>;
 			#size-cells = <0>;

-			GSWP(1, "e10", 10, &sw2phy1);
-			GSWP(2,  "e9",  9, &sw2phy2);
-			GSWP(3, "e12", 12, &sw2phy3);
-			GSWP(4, "e11", 11, &sw2phy4);
-			GSWP(5, "e18", 18, &sw2phy5);
-			GSWP(6, "e17", 17, &sw2phy6);
-			GSWP(7, "e20", 20, &sw2phy7);
-			GSWP(8, "e19", 19, &sw2phy8);
+			sw2p0: port@0 {
+				reg = <0x0>;
+				link = <&sw1p0>;
+				phy-mode = "10gbase-r";
+				fixed-link {
+					speed = <10000>;
+					full-duplex;
+				};
+			};
+
+			sw2p10: port@a {
+				reg = <0xa>;
+				link = <&sw3p10>;
+				phy-mode = "10gbase-r";
+				fixed-link {
+					speed = <10000>;
+					full-duplex;
+				};
+			};
+
+
+			GSWP(1, "e10", 10, sw2phy1);
+			GSWP(2,  "e9",  9, sw2phy2);
+			GSWP(3, "e12", 12, sw2phy3);
+			GSWP(4, "e11", 11, sw2phy4);
+			GSWP(5, "e18", 18, sw2phy5);
+			GSWP(6, "e17", 17, sw2phy6);
+			GSWP(7, "e20", 20, sw2phy7);
+			GSWP(8, "e19", 19, sw2phy8);
+			XSWP(9, "e15", 15, sfp2);
 		};

 		mdio {
@@ -462,14 +476,26 @@
 			#address-cells = <1>;
 			#size-cells = <0>;

-			GSWP(1,  "e2",  2, &sw1phy1);
-			GSWP(2,  "e1",  1, &sw1phy2);
-			GSWP(3,  "e4",  4, &sw1phy3);
-			GSWP(4,  "e3",  3, &sw1phy4);
-			GSWP(5,  "e6",  6, &sw1phy5);
-			GSWP(6,  "e5",  5, &sw1phy6);
-			GSWP(7,  "e8",  8, &sw1phy7);
-			GSWP(8,  "e7",  7, &sw1phy8);
+			sw1p0: port@0 {
+				reg = <0x0>;
+				link = <&sw2p0 &sw3p10>;
+				phy-mode = "10gbase-r";
+				fixed-link {
+					speed = <10000>;
+					full-duplex;
+				};
+			};
+
+			GSWP(1,  "e2",  2, sw1phy1);
+			GSWP(2,  "e1",  1, sw1phy2);
+			GSWP(3,  "e4",  4, sw1phy3);
+			GSWP(4,  "e3",  3, sw1phy4);
+			GSWP(5,  "e6",  6, sw1phy5);
+			GSWP(6,  "e5",  5, sw1phy6);
+			GSWP(7,  "e8",  8, sw1phy7);
+			GSWP(8,  "e7",  7, sw1phy8);
+			XSWP(9, "e14", 14, sfp1);
+			XSWP(a, "e13", 13, sfp0);
 		};

 		mdio {
@@ -34,10 +34,6 @@ CONFIG_PROFILING=y
 CONFIG_ARCH_SPARX5=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_1286807=y
-CONFIG_ARM64_ERRATUM_1542419=y
-CONFIG_ARM64_ERRATUM_2441009=y
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=64
@@ -61,7 +57,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
-CONFIG_CMA_AREAS=7
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_XDP_SOCKETS=y
@@ -170,6 +165,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BPFILTER=y
 CONFIG_BRIDGE=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BRIDGE_MRP=y
@@ -179,14 +175,9 @@ CONFIG_VLAN_8021Q=y
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_MQPRIO=y
 CONFIG_NET_CLS_BASIC=y
 CONFIG_NET_CLS_BPF=y
 CONFIG_NET_CLS_FLOWER=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_GACT=y
-CONFIG_NET_ACT_MIRRED=y
-CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_DCB=y
 CONFIG_NETLINK_DIAG=y
 CONFIG_MPLS=y
@@ -231,7 +222,6 @@ CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_VIRTIO=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
-CONFIG_SATA_MOBILE_LPM_POLICY=0
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_AHCI_MVEBU=y
 CONFIG_PATA_OF_PLATFORM=y
@@ -287,7 +277,6 @@ CONFIG_NET_DSA_MV88E6XXX_PTP=y
 CONFIG_MVNETA=m
 CONFIG_MVPP2=m
 # CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_META is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 CONFIG_SPARX5_SWITCH=y
 # CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -359,14 +348,13 @@ CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_HW_RANDOM_CN10K=m
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_GPIO=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MUX_PINCTRL=y
-CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_SLAVE=y
 CONFIG_SPI=y
@@ -502,7 +490,6 @@ CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
 CONFIG_TI_ADC081C=y
 CONFIG_PWM=y
-CONFIG_RESET_GPIO=y
 CONFIG_PHY_MVEBU_CP110_COMPHY=y
 CONFIG_PHY_MVEBU_CP110_UTMI=y
 CONFIG_PHY_SAMSUNG_USB2=y
@@ -520,7 +507,6 @@ CONFIG_FUSE_FS=y
 CONFIG_VIRTIO_FS=y
 CONFIG_OVERLAY_FS=y
 CONFIG_VFAT_FS=y
-CONFIG_EXFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_SQUASHFS=y
@@ -531,13 +517,13 @@ CONFIG_9P_FS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_SECURITY=y
-CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,bpf"
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_ECHAINIV=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=0
@@ -547,8 +533,6 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_TIMEOUT=20
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_RCU_TRACE is not set
@@ -1,172 +0,0 @@
-FriendlyELC NanoPi R2S
-======================
-
-The [NanoPi R2S][1] is a very low-cost 64-bit ARM min router, powered by
-the Rockchip RK3328, quad-core Cortex-A53.
-
-The R2S does not have any onboard eMMC, so the only way to boot Infix on
-it is using and SD card.
-
-
-LEDs
----
-
-The front system LEDs work as follows in Infix:
-
-| **Stage**      | **SYS** | **LAN** | **WAN** |
-|----------------|---------|---------|---------|
-| Power-on       | dimmed  | off     | off     |
-| Factory reset  | on      | on      | on      |
-| Linux loading  | on      | off     | off     |
-| System loading | 1 Hz    | off     | off     |
-| System up      | off     | on      | off     |
-| WAN address    | off     | on      | on      |
-| Locate         | 1 Hz    | 1 Hz    | 1 Hz    |
-| Fail safe      | 5 Hz    | off     | off     |
-| Panic          | 5 Hz    | 5 Hz    | 5 Hz    |
-
-Powering on the device the SYS LED is turned on faintly (dimmed).  It
-remains dimmed while U-Boot loads the kernel, and turns bright red when
-the kernel starts.  It remains steady on until the system has started
-the LED daemon, `iitod`, which sets it blinking at 1 Hz while the rest
-of the system starts up.  When the system has come up successfully, the
-SYS LED is turned off and the green LAN LED turns on.  The WAN LED will
-turn on (green) when the WAN interface is up and has an IP address.
-
-> Compared to the `x86_64` Qemu target, it takes a while to parse all
-> YANG models and load `startup-config`, but the whole process should
-> not take more than 60 seconds, and usually a lot less.
-
-If a "find my device" function exists, it will blink all LEDs at 1 Hz.
-
-If `startup-config` fails to load Ínfix reverts to `failure-config`,
-putting the device in fail safe (or fail secure) mode.  Indicated by
-the SYS LED blinking at 5 Hz instead of turning off.
-
-If Infix for some reason also fails to load `failure-config`, then all
-LEDs will blink at 5 Hz to clearly indicate something is very wrong.
-
-In all error cases the console shows the problem.
-
-
-Factory Reset
-------------
-
-The reset button on the side can be used not only to safely reboot the
-device, but can also be used to trigger a factory reset at power on.
-
-At power-on, keep the reset button pressed for 10 seconds.  The system
-LEDs (SYS, WAN, LAN) will all blink at 1 Hz, to help you count down the
-seconds.  When the 10 seconds have passed all LEDs are turned off before
-loading Linux.
-
-When Linux boots up it confirms the factory reset by lighting up the
-LEDs again, no blinking this time.  The LEDs stay on until all files and
-directories on read/writable partitions (`/cfg` and `/var`) have been
-safely erased.
-
-The system then continues loading, turning off all LEDs except SYS,
-which blinks calmly at 1 Hz as usual until the system has completed
-loading, this time with a `startup-config` freshly restored from the
-device's `factory-config`.
-
-
-How to Build
------------
-
-```
-$ make r2s_defconfig
-$ make
-```
-
-Once the build has finished you will have `output/images/sdcard.img`
-which you can flash to an SD card.
-
-```
-$ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=1M status=progress oflag=direct
-```
-
-> **WARNING:** ensure `/dev/mmcblk0` really is the correct device for
-> your SD card, and not used by the system!
-
-
-Booting the Board
-----------------
-
- 1. Connect a TTL cable to three UART pins, GND is closest to the edge
- 2. Insert the flashed SD card
- 3. Power-up the board using an USB-C cable (ensure good power source!)
-
-Worth noting, unlike many other boards, the Rockchip family of chipsets
-runs the UART at 1500000 bps (1.5 Mbps) 8N1.
-
-
-Console Port
------------
-
-Unlike many other boards, the NanoPi R2S console, and in fact all
-Rockchip family chipsets, runs at 1500000 bps (1.5 Mbps) 8N1. 
-
-
-Secure Boot
-----------
-
-Like other Infix builds, the R2S enjoys secure boot.  Please note,
-however that the default signing keys are the public!
-
-Also, default builds allow modifying and saving the U-Boot environment
-(see below), which you may want to disable to secure the device.  The
-device also runs in *developer mode*, allowing full U-Boot shell access,
-which you may also want to disable in a full production setting.
-
-
-Caveat
------
-
-Most (all?) of these boards do not have any Vital Product Data (VPD)
-EEPROM mounted.  This means they do not come with unique MAC addresses
-allocated to the two Ethernet ports.
-
-The bootloader (U-Boot) default environment for the board is usually
-what provides a default, the same default MAC addresses to Linux:
-
- - 4a:dc:d8:20:0d:84
- - 4a:dc:d8:20:0d:85
-
-This is important in case you want to run multiple R2S devices on the
-same LAN.  Meaning you either have to change the MAC address in the
-U-Boot environment (below), or use the `custom-phys-address` setting in
-Infix for the interface(s).
-
-Break into U-Boot using Ctrl-C at power-on, preferably when the text
-`Press Ctrl-C NOW to enter boot menu` is displayed.  Exit the menu to
-get to the prompt:
-
-```
-(r2s) printenv
-...
-eth1addr=4a:dc:d8:20:0d:84
-ethact=ethernet@ff540000
-ethaddr=4a:dc:d8:20:0d:85
-ethprime=eth0
-...
-```
-
-Here we change both addresses, using the *Locally Administered* bit:
-
-```
-(r2s) setenv eth1addr 02:00:c0:ff:ee:01
-(r2s) setenv ethaddr 02:00:c0:ff:ee:00
-(r2s) saveenv
-```
-
-Boot the system, log into Linux, and inspect the MAC addresses:
-
-```
-admin@infix-00-00-00:~$ ip -br l
-lo      UP     00:00:00:00:00:00 <LOOPBACK,UP,LOWER_UP>
-eth0    UP     02:00:c0:ff:ee:00 <BROADCAST,MULTICAST,UP,LOWER_UP>
-eth1    UP     02:00:c0:ff:ee:01 <BROADCAST,MULTICAST,UP,LOWER_UP>
-```
-
-[1]: https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S
@@ -0,0 +1,4 @@
+label Infix on NanoPi R2S
+  kernel /boot/Image
+  devicetree /boot/rk3328-nanopi-r2s.dtb
+  append root=/dev/mmcblk0p1 rw rootwait bonding.max_bonds=0 dummy.numdummies=0 fb_tunnels=none quiet
@@ -1,70 +1,37 @@
 image cfg.ext4 {
-	empty = true
-	temporary = true
-	size = 16M
-
 	ext4 {
 		label = "cfg"
 	}
-}
-
-image var.ext4 {
 	empty = true
-	temporary = true
-	size = 512M
-
-	ext4 {
-		label = "var"
-		use-mke2fs = true
-	}
+	size = 16M
 }

 image sdcard.img {
 	hdimage {
-		partition-table-type = "gpt"
 	}

 	partition u-boot-tpl-spl-dtb {
 		in-partition-table = "no"
-		offset = 32K
 		image = "idbloader.img"
+		offset = 32K
 	}

 	partition u-boot-dtb {
 		in-partition-table = "no"
-		offset = 8M
 		image = "u-boot.itb"
+		offset = 8M
 	}

-	partition aux {
-		partition-uuid = D4EF35A0-0652-45A1-B3DE-D63339C82035
+	partition rootfs {
+		partition-type = 0x83
 		offset = 16M
-		image = "aux.ext4"
-	}
-
-	partition primary {
-		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-		bootable = true
-		size = 200M
-		image = "rootfs.squashfs"
-	}
-
-	partition secondary {
-		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-		bootable = true
-		size = 200M
-		image = "rootfs.squashfs"
+		image = "rootfs.ext4"
 	}

 	partition cfg {
-		partition-uuid = 7aa497f0-73b5-47e5-b2ab-8752d8a48105
+		partition-type = 0x83
 		image = "cfg.ext4"
 	}
-
-	partition var {
-		partition-uuid = 8046A06A-E45A-4A14-A6AD-6684704A393F
-		image = "var.ext4"
-	}
 }

 # Silence genimage warnings
@@ -3,31 +3,22 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_AUDIT=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT=y
 CONFIG_PREEMPT=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_PSI=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=18
+CONFIG_NUMA_BALANCING=y
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -36,14 +27,19 @@ CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PROFILING=y
 CONFIG_KEXEC_FILE=y
+CONFIG_CRASH_DUMP=y
+CONFIG_ARCH_ACTIONS=y
 CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=8
+CONFIG_NUMA=y
 CONFIG_COMPAT=y
 CONFIG_RANDOMIZE_BASE=y
-# CONFIG_SUSPEND is not set
+CONFIG_HIBERNATION=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_ENERGY_MODEL=y
 CONFIG_ARM_PSCI_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
@@ -52,8 +48,8 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPUFREQ_DT=y
-CONFIG_ARM_SCMI_CPUFREQ=y
 CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=y
 CONFIG_ACPI=y
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
@@ -61,7 +57,6 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
-CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_MODULES=y
@@ -72,11 +67,8 @@ CONFIG_KSM=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
-CONFIG_CMA_AREAS=20
 CONFIG_NET=y
 CONFIG_PACKET=y
-CONFIG_XDP_SOCKETS=y
-CONFIG_XDP_SOCKETS_DIAG=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
@@ -84,66 +76,24 @@ CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE_DEMUX=y
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_MROUTE=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_IPV6=m
 CONFIG_NETFILTER=y
-CONFIG_BRIDGE_NETFILTER=y
-CONFIG_NETFILTER_NETLINK_QUEUE=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_TABLES=y
 CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_CT=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_REJECT_NETDEV=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
@@ -151,46 +101,17 @@ CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_CONNTRACK_BRIDGE=y
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE=y
+CONFIG_BRIDGE=m
 CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BRIDGE_MRP=y
-CONFIG_BRIDGE_CFM=y
-CONFIG_VLAN_8021Q=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
+CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_NET_SCHED=y
@@ -200,22 +121,13 @@ CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
 CONFIG_NET_CLS_FLOWER=m
 CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_GACT=y
-CONFIG_NET_ACT_MIRRED=y
-CONFIG_NET_ACT_NAT=y
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_ACT_VLAN=y
-CONFIG_NET_ACT_BPF=y
-CONFIG_DCB=y
-CONFIG_NETLINK_DIAG=y
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=y
-CONFIG_MPLS_ROUTING=m
-CONFIG_NET_PKTGEN=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_GATE=m
 CONFIG_BT=m
+CONFIG_BT_HIDP=m
 # CONFIG_BT_LE is not set
 CONFIG_BT_LEDS=y
 # CONFIG_BT_DEBUGFS is not set
@@ -230,7 +142,6 @@ CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
-# CONFIG_ETHTOOL_NETLINK is not set
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_IOV=y
@@ -246,7 +157,6 @@ CONFIG_PCI_EPF_TEST=m
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_VEXPRESS_CONFIG=y
 CONFIG_ARM_SCMI_PROTOCOL=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_EFI_CAPSULE_LOADER=y
@@ -261,7 +171,6 @@ CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_DATAFLASH=y
 CONFIG_MTD_SST25L=y
-CONFIG_MTD_BLOCK2MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_DENALI_DT=y
 CONFIG_MTD_SPI_NOR=y
@@ -282,7 +191,6 @@ CONFIG_SCSI_HISI_SAS=y
 CONFIG_SCSI_HISI_SAS_PCI=y
 CONFIG_MEGARAID_SAS=y
 CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_VIRTIO=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=y
@@ -290,29 +198,24 @@ CONFIG_AHCI_CEVA=y
 CONFIG_SATA_SIL24=y
 CONFIG_PATA_OF_PLATFORM=y
 CONFIG_MD=y
-# CONFIG_MD_BITMAP_FILE is not set
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_INIT=y
-CONFIG_DM_VERITY=y
-CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
 CONFIG_NETDEVICES=y
 CONFIG_BONDING=m
-CONFIG_DUMMY=m
+CONFIG_DUMMY=y
 CONFIG_WIREGUARD=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
-CONFIG_VXLAN=m
+CONFIG_VXLAN=y
 CONFIG_GENEVE=m
 CONFIG_BAREUDP=m
-CONFIG_MACSEC=m
-CONFIG_TUN=m
+CONFIG_TUN=y
 CONFIG_VETH=m
-CONFIG_VIRTIO_NET=y
-CONFIG_NLMON=y
-CONFIG_NET_VRF=y
+CONFIG_VIRTIO_NET=m
 # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ACTIONS is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_AGERE is not set
 # CONFIG_NET_VENDOR_ALACRITECH is not set
@@ -380,12 +283,15 @@ CONFIG_STMMAC_ETH=y
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
-CONFIG_LED_TRIGGER_PHY=y
 CONFIG_AX88796B_PHY=y
-CONFIG_DAVICOM_PHY=m
+CONFIG_MICREL_PHY=y
+CONFIG_MICROSEMI_PHY=y
+CONFIG_AT803X_PHY=m
 CONFIG_REALTEK_PHY=y
 CONFIG_ROCKCHIP_PHY=y
 CONFIG_MDIO_BITBANG=y
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_THUNDER=y
 CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_USB_RTL8150=m
@@ -393,7 +299,6 @@ CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDC_NCM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
@@ -401,12 +306,13 @@ CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_CDC_SUBSET=m
-# CONFIG_USB_NET_ZAURUS is not set
+CONFIG_USB_NET_ZAURUS=m
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_WCN36XX=m
 # CONFIG_WLAN_VENDOR_ATMEL is not set
 # CONFIG_WLAN_VENDOR_BROADCOM is not set
+# CONFIG_WLAN_VENDOR_CISCO is not set
 # CONFIG_WLAN_VENDOR_INTEL is not set
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
 # CONFIG_WLAN_VENDOR_MARVELL is not set
@@ -449,11 +355,9 @@ CONFIG_RTW89_DEBUGMSG=y
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+CONFIG_NET_FAILOVER=y
 CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=y
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
+# CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_RK805_PWRKEY=y
@@ -500,38 +404,47 @@ CONFIG_PPS=y
 CONFIG_DEBUG_PINCTRL=y
 CONFIG_PINCTRL_RK805=y
 CONFIG_PINCTRL_SINGLE=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
+CONFIG_GPIO_ALTERA=m
+CONFIG_GPIO_DWAPB=y
+CONFIG_GPIO_MB86S7X=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_MAX732X=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_SYSCON_REBOOT_MODE=y
-CONFIG_CHARGER_RK817=y
+CONFIG_BATTERY_SBS=m
+CONFIG_BATTERY_BQ27XXX=y
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
 CONFIG_SENSORS_ARM_SCMI=y
 CONFIG_SENSORS_ARM_SCPI=y
+CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_PWM_FAN=m
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_SYSFS=y
-CONFIG_SOFT_WATCHDOG=y
+CONFIG_ARM_SP805_WATCHDOG=y
+CONFIG_ARM_SBSA_WATCHDOG=y
+CONFIG_DW_WATCHDOG=y
+CONFIG_ARM_SMC_WATCHDOG=y
 CONFIG_MFD_RK8XX_I2C=y
 CONFIG_MFD_RK8XX_SPI=y
-# CONFIG_MFD_VEXPRESS_SYSREG is not set
-CONFIG_REGULATOR=y
+CONFIG_MFD_STMFX=y
 CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_USERSPACE_CONSUMER=y
-CONFIG_REGULATOR_NETLINK_EVENTS=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_VCTRL=y
-# CONFIG_HID_SUPPORT is not set
-CONFIG_USB_ULPI_BUS=y
+CONFIG_REGULATOR_VEXPRESS=m
+# CONFIG_HID_GENERIC is not set
+# CONFIG_USB_HID is not set
 CONFIG_USB_CONN_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -539,7 +452,6 @@ CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
@@ -548,6 +460,10 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC2=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_SIMPLE=m
@@ -555,6 +471,7 @@ CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_HSIC_USB3503=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
@@ -571,6 +488,12 @@ CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_ARMMMCI=y
@@ -582,9 +505,13 @@ CONFIG_MMC_SDHCI_CADENCE=y
 CONFIG_MMC_SDHCI_F_SDH30=y
 CONFIG_MMC_SPI=y
 CONFIG_MMC_DW=y
+CONFIG_MMC_DW_EXYNOS=y
 CONFIG_MMC_DW_HI3798CV200=y
 CONFIG_MMC_DW_K3=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_MTK=y
+CONFIG_MMC_SDHCI_XENON=y
+CONFIG_MMC_SDHCI_AM654=y
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SCSI_UFSHCD_PLATFORM=y
 CONFIG_NEW_LEDS=y
@@ -600,7 +527,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_RK808=y
 CONFIG_RTC_DRV_EFI=y
@@ -615,6 +541,7 @@ CONFIG_VIRTIO_INPUT=y
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VHOST_MENU is not set
 CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
 CONFIG_RTLLIB=m
 CONFIG_RTL8192E=m
 CONFIG_RTL8723BS=m
@@ -638,6 +565,7 @@ CONFIG_ROCKCHIP_IODOMAIN=y
 CONFIG_ROCKCHIP_DTPM=m
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_MEMORY=y
 CONFIG_IIO=y
@@ -650,7 +578,6 @@ CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_MPL3115=m
 CONFIG_PWM=y
 CONFIG_PWM_ROCKCHIP=y
-CONFIG_RESET_GPIO=y
 CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
@@ -663,6 +590,8 @@ CONFIG_PHY_ROCKCHIP_USB=m
 CONFIG_POWERCAP=y
 CONFIG_ARM_SCMI_POWERCAP=y
 CONFIG_DTPM=y
+CONFIG_DTPM_CPU=y
+CONFIG_DTPM_DEVFREQ=y
 CONFIG_ARM_SMMU_V3_PMU=m
 CONFIG_NVMEM_RMEM=m
 CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -674,48 +603,30 @@ CONFIG_INTERCONNECT=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_BTRFS_FS=y
-CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
-CONFIG_AUTOFS_FS=y
-CONFIG_FUSE_FS=y
-CONFIG_VIRTIO_FS=y
-CONFIG_OVERLAY_FS=y
-CONFIG_MSDOS_FS=y
+CONFIG_OVERLAY_FS=m
 CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_EXFAT_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_CHILDREN=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_EFIVAR_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_XATTR=y
 CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZSTD=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_ROOT_NFS=y
 CONFIG_9P_FS=y
-CONFIG_NLS_DEFAULT="iso8859-15"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
 CONFIG_SECURITY=y
 CONFIG_CRYPTO_DH=m
 CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_ECHAINIV=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_ZSTD=y
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
@@ -724,22 +635,20 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA3_ARM64=m
 CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_BS=m
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=y
 CONFIG_CRYPTO_DEV_CCREE=m
-CONFIG_PACKING=y
 CONFIG_INDIRECT_PIO=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC8=y
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=32
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
-CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_SCHED_DEBUG is not set
-CONFIG_FUNCTION_TRACER=y
+# CONFIG_FTRACE is not set
 CONFIG_MEMTEST=y
@@ -1,206 +0,0 @@
-{
-  "ieee802-dot1ab-lldp:lldp": {
-    "infix-lldp:enabled": true
-  },
-  "ietf-interfaces:interfaces": {
-    "interface": [
-      {
-        "name": "lo",
-        "type": "infix-if-type:loopback",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "127.0.0.1",
-              "prefix-length": 8
-            }
-          ]
-        },
-        "ietf-ip:ipv6": {
-          "address": [
-            {
-              "ip": "::1",
-              "prefix-length": 128
-            }
-          ]
-        }
-      },
-      {
-        "name": "lan",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "192.168.2.1",
-              "prefix-length": 24
-            }
-          ]
-        },
-        "ietf-ip:ipv6": {}
-      },
-      {
-        "name": "wan",
-        "type": "infix-if-type:ethernet"
-      }
-    ]
-  },
-  "ietf-keystore:keystore": {
-    "asymmetric-keys": {
-      "asymmetric-key": [
-        {
-          "name": "genkey",
-          "public-key-format": "ietf-crypto-types:ssh-public-key-format",
-          "public-key": "",
-          "private-key-format": "ietf-crypto-types:rsa-private-key-format",
-          "cleartext-private-key": "",
-          "certificates": {}
-        }
-      ]
-    }
-  },
-  "ietf-netconf-acm:nacm": {
-    "enable-nacm": true,
-    "groups": {
-      "group": [
-        {
-          "name": "admin",
-          "user-name": [
-            "admin"
-          ]
-        }
-      ]
-    },
-    "rule-list": [
-      {
-        "name": "admin-acl",
-        "group": [
-          "admin"
-        ],
-        "rule": [
-          {
-            "name": "permit-all",
-            "module-name": "*",
-            "access-operations": "*",
-            "action": "permit",
-            "comment": "Allow 'admin' group complete access to all operations and data."
-          }
-        ]
-      },
-      {
-        "name": "default-deny-all",
-        "group": [
-          "*"
-        ],
-        "rule": [
-          {
-            "name":  "deny-password-read",
-            "module-name": "ietf-system",
-            "path": "/ietf-system:system/authentication/user/password",
-            "access-operations": "*",
-            "action": "deny"
-          }
-        ]
-      }
-    ]
-  },
-  "ietf-netconf-server:netconf-server": {
-    "listen": {
-      "endpoints": {
-        "endpoint": [
-          {
-            "name": "default-ssh",
-            "ssh": {
-              "tcp-server-parameters": {
-                "local-address": "::"
-              },
-              "ssh-server-parameters": {
-                "server-identity": {
-                  "host-key": [
-                    {
-                      "name": "default-key",
-                      "public-key": {
-                        "central-keystore-reference": "genkey"
-                      }
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        ]
-      }
-    }
-  },
-  "ietf-system:system": {
-    "hostname": "r2s",
-    "ntp": {
-      "enabled": true,
-      "server": [
-        {
-          "name": "ntp.org",
-          "udp": {
-            "address": "pool.ntp.org"
-          },
-	  "iburst": true
-        }
-      ]
-    },
-    "authentication": {
-      "user": [
-        {
-          "name": "admin",
-          "password": "$factory$",
-          "infix-system:shell": "bash"
-        }
-      ]
-    },
-    "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCAtLSBhIE5ldHdvcmsgT3BlcmF0aW5nIFN5c3RlbQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQuZ2l0aHViLmlvCictJy0tLSctJwo="
-  },
-  "infix-dhcp-client:dhcp-client": {
-    "client-if": [
-      {
-        "if-name": "wan",
-        "option": [
-          {
-            "name": "broadcast"
-          },
-          {
-            "name": "dns"
-          },
-          {
-            "name": "domain"
-          },
-          {
-            "name": "hostname"
-          },
-          {
-            "name": "ntpsrv"
-          },
-          {
-            "name": "router"
-          },
-          {
-            "name": "subnet"
-          }
-        ]
-      }
-    ]
-  },
-  "infix-meta:meta": {
-    "infix-meta:version": "1.2"
-  },
-  "infix-services:mdns": {
-    "enabled": true
-  },
-  "infix-services:web": {
-    "enabled": true,
-    "console": {
-      "enabled": true
-    },
-    "netbrowse": {
-      "enabled": true
-    },
-    "restconf": {
-      "enabled": true
-    }
-  }
-}
@@ -1 +0,0 @@
-../available/input-event-daemon.conf
@@ -1 +0,0 @@
-service [12345789] log wan-monitor.sh -- WAN Health monitor
@@ -1,91 +0,0 @@
-{
-    "input": {
-	"path": {
-	    "locate":       { "path": "/run/led/locate" },
-
-	    "status-prime": { "path": "/run/led/status-prime" },
-	    "status-ok":    { "path": "/run/led/status-ok" },
-	    "status-err":   { "path": "/run/led/status-err" },
-	    "status-crit":  { "path": "/run/led/status-crit" },
-
-	    "fault-prime":  { "path": "/run/led/fault-prime" },
-	    "fault-ok":     { "path": "/run/led/fault-ok" },
-	    "fault-err":    { "path": "/run/led/fault-err" },
-	    "fault-crit":   { "path": "/run/led/fault-crit" },
-
-	    "wan-up":       { "path": "/run/led/wan-up" },
-
-	    "startup":   { "path": "/run/finit/cond/run/startup/success" },
-	    "fail-safe": { "path": "/run/finit/cond/run/failure/success" },
-	    "panic":     { "path": "/run/finit/cond/run/failure/failure" }
-	},
-	"udev": {
-	    "power-a": { "subsystem": "power_supply" },
-	    "power-b": { "subsystem": "power_supply" }
-	}
-    },
-
-    "output": {
-	"led-group": {
-	    "port-link-act": {
-		"match": ["*:green:tp", "*:green:sfp", "*:green:port" ],
-
-		"rules": [
-		    { "if": "true", "then": { "trigger": "netdev", "link": 1, "rx": 1, "tx": 1 } }
-		]
-	    },
-	    "port-alarm": {
-		"match": ["*:yellow:tp", "*:yellow:sfp", "*:yellow:port" ],
-
-		"rules": [
-		]
-	    }
-	},
-	"led": {
-	    "nanopi-r2s:red:sys": {
-		"rules": [
-		    { "if": "locate",    "then": "@blink-1hz" },
-		    { "if": "panic",     "then": "@blink-5hz" },
-		    { "if": "fail-safe", "then": "@blink-5hz" },
-		    { "if": "startup",   "then": "@off" },
-		    { "if": "true",      "then": "@blink-1hz" }
-		]
-	    },
-
-	    "nanopi-r2s:green:lan": {
-		"rules": [
-		    { "if": "locate",  "then": "@blink-1hz" },
-		    { "if": "panic",   "then": "@blink-5hz" },
-		    { "if": "startup", "then": "@on" }
-		]
-	    },
-
-	    "nanopi-r2s:green:wan": {
-		"rules": [
-		    { "if": "locate", "then": "@blink-1hz" },
-		    { "if": "panic",  "then": "@blink-5hz" },
-		    { "if": "wan-up", "then": "@on" }
-		]
-	    }
-	}
-    },
-
-    "aliases": {
-	"on": {
-	    "brightness": true
-	},
-	"off": {
-	    "brightness": false
-	},
-	"blink-1hz": {
-	    "trigger": "timer",
-	    "delay_on": 500,
-	    "delay_off": 500
-	},
-	"blink-5hz": {
-	    "trigger": "timer",
-	    "delay_on": 100,
-	    "delay_off": 100
-	}
-    }
-}
@@ -1,5 +0,0 @@
-[Global]
-listen = /dev/input/event1
-
-[Keys]
-RESTART = reboot
@@ -1,2 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/platform/ff540000.ethernet/net/eth0", NAME="wan"
-ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/platform/ff600000.usb/xhci-hcd.0.auto/usb3/3-1/3-1:1.0/net/*", NAME="lan"
@@ -1,41 +0,0 @@
-#!/bin/sh
-# Background WAN interface monitor.  Lights up WAN LED
-# while the interface has a DHCP address.
-
-LED_FILE="/run/led/wan-up"
-PID_FILE="/run/$(basename "$0").pid"
-
-check_wan()
-{
-    ip_info=$(ip a show wan)
-
-    if echo "$ip_info" | grep -q "inet .* proto dhcp"; then
-        [ ! -f "$LED_FILE" ] && touch "$LED_FILE"
-    else
-        [ -f "$LED_FILE" ] && rm "$LED_FILE"
-    fi
-}
-
-cleanup()
-{
-    rm -f "$LED_FILE"
-    rm -f "$PID_FILE"
-    exit 0
-}
-
-trap 'cleanup' TERM INT HUP QUIT
-echo $$ > "$PID_FILE"
-
-remaining_time=$((1800 - $(awk '{print int($1)}' /proc/uptime)))
-[ "$remaining_time" -lt 0 ] && remaining_time=0
-
-while [ "$remaining_time" -gt 0 ]; do
-    check_wan
-    sleep 1
-    remaining_time=$((remaining_time - 1))
-done
-
-while :; do
-    check_wan
-    sleep 5
-done
@@ -1,16 +0,0 @@
-CONFIG_BUTTON=y
-CONFIG_BUTTON_GPIO=y
-
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-
-# CONFIG_MMC_PCI is not set
-CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi r2s-env.dtsi"
-CONFIG_SYS_PROMPT="(r2s) "
-
-CONFIG_ENV_OVERWRITE=y
-# CONFIG_ENV_IS_NOWHERE is not set
-CONFIG_ENV_IS_IN_EXT4=y
-# CONFIG_ENV_IS_IN_MMC is not set
-CONFIG_ENV_EXT4_INTERFACE="mmc"
-CONFIG_ENV_EXT4_DEVICE_AND_PART="1:1"
@@ -1,47 +0,0 @@
-/ {
-	config {
-		environment {
-			boot_targets = "mmc1";
-			ethprime = "eth0";
-
-			/* This is a development platform, hard code developer mode */
-			ixbtn-devmode = "setenv dev_mode yes; echo Enabled";
-
-			/* Override default definitiion to add LED feedback */
-                        ixbtn-factory = "
-if button factory-reset; then
-    echo \"Keep button pressed for 10 seconds to engage factory reset ...\"
-
-    for tick in . . . . . . . . . .; do
-        led nanopi-r2s:red:sys   on
-        led nanopi-r2s:green:lan on
-        led nanopi-r2s:green:wan on
-        sleep 0.5
-        led nanopi-r2s:red:sys   off
-        led nanopi-r2s:green:lan off
-        led nanopi-r2s:green:wan off
-        sleep 0.5
-        echo -n \"Checking button: \"
-        button factory-reset || exit
-    done
-
-    echo -n \"Final button check: \"
-    if button factory-reset; then
-        setenv factory_reset yes
-        echo \"FACTORY RESET ENGAGED\"
-    fi
-fi
-";
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		factory-reset {
-			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_POWER>;
-			label = "factory-reset";
-		};
-	};
-};
@@ -160,9 +160,3 @@ config FIT_ARCH
 config FIT_KERNEL_LOAD_ADDR
 	string "Kernel load address"
 	depends on FIT_IMAGE
-
-config SDCARD_AUX
-	bool "Create SD-card aux partition"
-	help
-	  Create and populate aux.ext4 with rootfs.itbh and rauc.status
-	  For use with a static genimage.cfg for, e.g., SD-cards.
@@ -1,130 +0,0 @@
-Welcome to Infix!
-=================
-
-Nice to meet ❤️ you!  If you are reading this then you have possibly
-just downloaded and unpacked a release build and are curious about how
-to proceed from here.
-
-To test Infix You need a Linux 🐧 system with Qemu or GNS3 installed.
-We recommend Debian based systems, like Ubuntu and Linux Mint.
-
-> For a pain-free experience we recommend enabling CPU virtualization in
-> your BIOS/UEFI, which for many computers is disabled by default.
-
-From this point we assume you have your x86_64/AMD64 based Linux system
-up and running.  Time to start your favorite terminal application! 😃
-
-
-Installing Qemu
---------------
-
-This README focus on getting you started with Qemu.  From a terminal,
-install (at least) the x86/x86_64 emulator.  The 'virt-manager' is a
-package that helps pull in other dependencies you may need:
-
-    $ sudo apt install qemu-system-x86 virt-manager
-
-That's it.
-
-
-Running Infix in Qemu
---------------------
-
-Depending on how your Linux installation is set up, the following may
-require being run with superuser privileges, i.e., you may need to
-repend the command with 'sudo'.
-
-    $ ./qemu.sh
-
-You should now see the Infix init system booting up.  When the final
-"Please press Enter to activate this console." is shown, press Enter
-and the login: prompt is displayed.
-
-The default credentials for the demo builds is
-
-    login: admin
-    password: admin
-
-    Infix -- a Network Operating System v24.09.0-rc1 (hvc0)
-    infix-00-00-00 login: admin
-    Password: 
-    .-------.
-    |  . .  | Infix -- a Network Operating System
-    |-. v .-| https://kernelkit.org
-    '-'---'-'
-
-    Run the command 'cli' for interactive OAM
-
-    admin@infix-00-00-00:~$
-
-You're in!  Play around in your sandbox as much as you like, if you
-run into problems or have questions, please see the documentation,
-and don't hesitate to get in touch with us! 😃
-
- - https://github.com/kernelkit/infix/tree/main/doc
-
-
-Customizing your "Hardware"
---------------------------
-
-For more Ethernet ports in your emulated system you need to change the
-Qemu configuration used for Infix.  This can be done using a menuconfig
-interface, which requires the following extra package:
-
-    $ sudo apt install kconfig-frontends
-
-We can now enter the configuration:
-
-    $ ./qemu.sh -c
-
-Go down to *Networking*, select *TAP*, now you can change the *Number of
-TAPs*, e.g. to 10.  Exit and save the configuration, then you can start
-Qemu again:
-
-   ./qemu.sh
-
-> Make sure to do a factory reset from the CLI, otherwise you will be
-> stuck with that single interface from before.
-
-
-Errors on Console
-----------------
-
-If you see the following line printed one or more times, don't panic.
-
-    LABEL=var: Can't lookup blockdev
-
-See the Customizing section above.  To silence the error you need to
-create another writable partition for Infix to store logs, container
-images, etc.  Look for the 'var' keyword, you can adjust the size of
-the partition.
-
-
-Graphical Network Simulator 3 (GNS3)
------------------------------------
-
-GNS3 is a very powerful front-end to Qemu which takes care of creating
-virtual links between network devices running in Qemu.  This README is
-only link to the material you need.  This directory holds the appliance
-file, .gns3a, that references image files also in this directory, that
-you need to load into GNS3.
-
-The necessary extra packages are available through the offical PPA.  If
-you don't know what a PPA is, read up on that first:
-
- - https://launchpad.net/~gns3/+archive/ubuntu/ppa
-
-There's a lot of tutorials and guides online, start here:
-
- - https://docs.gns3.com/docs/
-
-
-About
-----
-
-Infix is a free, Linux based, immutable Network Operating System (NOS)
-built on Buildroot, and sysrepo.  A powerful mix that ease porting to
-different platforms, simplify long-term maintenance, and provide easy
-management using NETCONF, RESTCONF, or the built-in command line
-interface (CLI) from a console or SSH login.
-
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.36.1
-# Sun Feb  9 12:25:37 2025
+# Busybox version: 1.36.0
+# Thu Feb  8 08:22:32 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y

@@ -17,7 +17,7 @@ CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 # CONFIG_FEATURE_COMPRESS_USAGE is not set
 CONFIG_LFS=y
-CONFIG_PAM=y
+# CONFIG_PAM is not set
 CONFIG_FEATURE_DEVPTS=y
 CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_WTMP=y
@@ -325,7 +325,7 @@ CONFIG_FEATURE_STAT_FILESYSTEM=y
 CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
-CONFIG_FEATURE_SYNC_FANCY=y
+# CONFIG_FEATURE_SYNC_FANCY is not set
 CONFIG_FSYNC=y
 # CONFIG_TAC is not set
 CONFIG_TAIL=y
@@ -336,7 +336,7 @@ CONFIG_TEST=y
 CONFIG_TEST1=y
 CONFIG_TEST2=y
 CONFIG_FEATURE_TEST_64=y
-CONFIG_TIMEOUT=y
+# CONFIG_TIMEOUT is not set
 CONFIG_TOUCH=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
@@ -357,7 +357,7 @@ CONFIG_BASE32=y
 CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
+# CONFIG_FEATURE_WC_LARGE is not set
 CONFIG_WHO=y
 CONFIG_W=y
 CONFIG_USERS=y
@@ -957,10 +957,10 @@ CONFIG_FEATURE_NETSTAT_PRG=y
 CONFIG_NSLOOKUP=y
 CONFIG_FEATURE_NSLOOKUP_BIG=y
 CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_FEATURE_NTPD_CONF is not set
-# CONFIG_FEATURE_NTP_AUTH is not set
+CONFIG_NTPD=y
+CONFIG_FEATURE_NTPD_SERVER=y
+CONFIG_FEATURE_NTPD_CONF=y
+CONFIG_FEATURE_NTP_AUTH=y
 CONFIG_PING=y
 CONFIG_PING6=y
 CONFIG_FEATURE_FANCY_PING=y
@@ -16,22 +16,13 @@ die()
 #      DISK_IMAGE_SIZE="512"
 #      etc.
 #
-# Nested variables, like INFIX_COMPATIBLE="${INFIX_IMAGE_ID}"
-# are handled by sourcing the file in a subshell.
-#
 # shellcheck disable=SC1090
 load_cfg()
 {
    tmp=$(mktemp -p /tmp)
-    (
-	. "$BR2_CONFIG" 2>/dev/null
-
-	# Set *all* matching variables
-	set | grep -E "^${1}[^=]*=" | while IFS= read -r line; do
-            echo "$line"
-	done
-    ) > "$tmp"

+    grep -E "${1}.*=" "$BR2_CONFIG" >"$tmp"
    .  "$tmp"
+
    rm "$tmp"
 }
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-rootdir=$BUILD_DIR/genimage.root
-tempdir=$BUILD_DIR/genimage.tmp
-
-cat <<EOF > /tmp/mkaux.cfg
-image aux.ext4 {
-	mountpoint = "/aux"
-	size = 16M
-
-	ext4 {
-		label = "aux"
-		use-mke2fs = true
-		features = "^metadata_csum,^metadata_csum_seed"
-	}
-}
-
-# Silence genimage warnings
-config {}
-EOF
-
-rm -rf   "$rootdir/aux"
-mkdir -p "$rootdir/aux"
-cp -f "$BINARIES_DIR/rootfs.itbh" "$rootdir/aux/primary.itbh"
-cp -f "$BINARIES_DIR/rootfs.itbh" "$rootdir/aux/secondary.itbh"
-cp -f "$BINARIES_DIR/rauc.status" "$rootdir/aux/rauc.status"
-
-mkenvimage -s 0x4000 -o "$rootdir/aux/uboot.env" \
-	   "$BR2_EXTERNAL_INFIX_PATH/board/common/uboot/aux-env.txt"
-
-rm -rf "$BINARIES_DIR/aux.ext4"
-rm -rf "$tempdir"
-
-genimage \
-    --rootpath   "$rootdir" \
-    --tmppath    "$tempdir" \
-    --inputpath  "$BINARIES_DIR" \
-    --outputpath "$BINARIES_DIR" \
-    --config "/tmp/mkaux.cfg"
@@ -2,29 +2,31 @@

 set -e

+GIT_VERSION=$(git -C $BR2_EXTERNAL_INFIX_PATH describe --always --dirty --tags)
+
 name=$1
-compat=$2
+arch=$2
 sign=$3

 crt=$(ls $sign/*.crt)
 key=$(ls $sign/*.key)

-common=$(dirname "$(readlink -f "$0")")
+common=$(dirname $(readlink -f "$0"))

 work=$BUILD_DIR/mkrauc
-mkdir -p "$work"
+mkdir -p $work

-cp -f "$common/rauc-hooks.sh" "$work/hooks.sh"
+cp -f $common/rauc-hooks.sh $work/hooks.sh

 # RAUC internally uses the file extension to find a suitable install
 # handler, hence the name must be .img
-cp -f "$BINARIES_DIR/rootfs.squashfs" "$work/rootfs.img"
-cp -f "$BINARIES_DIR/rootfs.itbh"     "$work/rootfs.itbh"
+cp -f $BINARIES_DIR/rootfs.squashfs $work/rootfs.img
+cp -f $BINARIES_DIR/rootfs.itbh $work/rootfs.itbh

-cat >"$work/manifest.raucm" <<EOF
+cat >$work/manifest.raucm <<EOF
 [update]
-compatible=${compat}
-version=${INFIX_VERSION}
+compatible=infix-${arch}
+version=${GIT_VERSION}

 [bundle]
 format=verity
@@ -37,7 +39,7 @@ filename=rootfs.img
 hooks=post-install
 EOF

-rm -f "$BINARIES_DIR/$name.pkg"
+rm -f $BINARIES_DIR/$name.pkg

-rauc --cert="$crt" --key="$key" \
-     bundle "$work" "$BINARIES_DIR/$name.pkg"
+rauc --cert=$crt --key=$key \
+    bundle $work $BINARIES_DIR/$name.pkg
@@ -4,49 +4,24 @@ common=$(dirname "$(readlink -f "$0")")
 . "$BR2_CONFIG" 2>/dev/null
 . "$TARGET_DIR/usr/lib/os-release"

-# Extract list of loaded YANG modules and their features for yangdoc.html
-mkyangdoc()
-{
-    cmd="yangdoc -o $1 -p $TARGET_DIR/usr/share/yang"
-
-    # shellcheck disable=SC2155
-    export SYSREPO_SHM_PREFIX="yangdoc"
-    while IFS= read -r line; do
-        if echo "$line" | grep -q '^[a-z]'; then
-            module=$(echo "$line" | awk '{print $1}')
-            cmd="$cmd -m $module"
-            feature=$(echo "$line" | awk -F'|' '{print $8}' | sed 's/^ *//;s/ *$//')
-            if [ -n "$feature" ]; then
-                feature_list=$(echo "$feature" | tr ' ' '\n')
-                for feat in $feature_list; do
-                    cmd="$cmd -e $feat"
-                done
-            fi
-        fi
-    done <<EOF
-$(sysrepoctl -l; rm -f /dev/shm/${SYSREPO_SHM_PREFIX}*)
-EOF
-
-    # Ignore a few top-level oddballs not used by core Infix
-    cmd="$cmd -x supported-algorithms"
-
-    # Execute the command
-    echo "Calling: $cmd"
-    $cmd
-}
-
 if [ -n "${ID_LIKE}" ]; then
    ID="${ID} ${ID_LIKE}"
 fi

-if [ -n "$INFIX_IMAGE_ID" ]; then
-    NAME="$INFIX_IMAGE_ID"
-else
-    NAME="$INFIX_ID"-$(echo "$BR2_ARCH" | tr _ - | sed 's/x86-64/x86_64/')
+if [ -z "$GIT_VERSION" ]; then
+    infix_path="$BR2_EXTERNAL_INFIX_PATH"
+    if [ -n "$INFIX_OEM_PATH" ]; then
+	# Use version from br2-external OEM:ing Infix
+	infix_path="$INFIX_OEM_PATH"
+    fi
+    GIT_VERSION=$(git -C "$infix_path" describe --always --dirty --tags)
 fi

-if [ -f "$TARGET_DIR/etc/rauc/system.conf" ]; then
-    sed -i "s/compatible=.*/compatible=$INFIX_COMPATIBLE/" "$TARGET_DIR/etc/rauc/system.conf"
+# Override VERSION in /etc/os-release and filenames for release builds
+if [ -n "$INFIX_RELEASE" ]; then
+    VERSION="$INFIX_RELEASE"
+else
+    VERSION=$GIT_VERSION
 fi

 # This is a symlink to /usr/lib/os-release, so we remove this to keep
@@ -55,12 +30,12 @@ rm -f "$TARGET_DIR/etc/os-release"
 {
    echo "NAME=\"$INFIX_NAME\""
    echo "ID=$INFIX_ID"
-    echo "PRETTY_NAME=\"$INFIX_TAGLINE $INFIX_VERSION\""
+    echo "PRETTY_NAME=\"$INFIX_TAGLINE $VERSION\""
    echo "ID_LIKE=\"${ID}\""
    echo "DEFAULT_HOSTNAME=$BR2_TARGET_GENERIC_HOSTNAME"
-    echo "VERSION=\"${INFIX_VERSION}\""
-    echo "VERSION_ID=${INFIX_VERSION}"
-    echo "BUILD_ID=\"${INFIX_BUILD_ID}\""
+    echo "VERSION=\"${VERSION}\""
+    echo "VERSION_ID=${VERSION}"
+    echo "BUILD_ID=\"${GIT_VERSION}\""
    if [ -n "$INFIX_IMAGE_ID" ]; then
 	echo "IMAGE_ID=\"$INFIX_IMAGE_ID\""
    fi
@@ -86,11 +61,7 @@ rm -f "$TARGET_DIR/etc/os-release"
    fi
 } > "$TARGET_DIR/etc/os-release"

-echo "$INFIX_TAGLINE $INFIX_VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version"
-
-# In case of ambguities, this is what the image was built from
-cp "$BR2_CONFIG" "$TARGET_DIR/usr/share/infix/config"
-gzip -f "$TARGET_DIR/usr/share/infix/config"
+echo "$INFIX_TAGLINE $VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version"

 # Drop Buildroot default symlink to /tmp
 if [ -L "$TARGET_DIR/var/lib/avahi-autoipd" ]; then
@@ -98,9 +69,6 @@ if [ -L "$TARGET_DIR/var/lib/avahi-autoipd" ]; then
 	mkdir "$TARGET_DIR/var/lib/avahi-autoipd"
 fi

-# Drop Buildroot default pam_lastlog.so from login chain
-sed -i '/^[^#]*pam_lastlog.so/s/^/# /' "$TARGET_DIR/etc/pam.d/login"
-
 # Allow pdmenu (setup) and bash to be login shells, bash is added
 # automatically when selected in menuyconfig, but not when BusyBox
 # provides a symlink (for ash).  The /bin/{true,false} are old UNIX
@@ -117,8 +85,3 @@ grep -qsE '^/bin/false$$' "$TARGET_DIR/etc/shells" \
 # Allow clish (symlink to /usr/bin/klish) to be a login shell
 grep -qsE '^/bin/clish$$' "$TARGET_DIR/etc/shells" \
        || echo "/bin/clish" >> "$TARGET_DIR/etc/shells"
-
-# Create YANG documentation
-if [ "$BR2_PACKAGE_HOST_PYTHON_YANGDOC" = "y" ]; then
-   mkyangdoc "$BINARIES_DIR/yangdoc.html"
-fi
@@ -7,17 +7,11 @@ common=$(dirname "$(readlink -f "$0")")
 # shellcheck disable=SC1091
 . "$TARGET_DIR/etc/os-release"

-# The INFIX_* variables may be composed from BR2_* variables,
-# so we source them last.
+load_cfg INFIX_ID
 load_cfg BR2_ARCH
 load_cfg BR2_DEFCONFIG
 load_cfg BR2_EXTERNAL_INFIX_PATH
 load_cfg BR2_TARGET_ROOTFS
-load_cfg INFIX_ID
-load_cfg INFIX_COMPATIBLE
-
-# The default IMAGE_ID is infix-$BR2_ARCH but can be overridden
-# for imaage names, and compat strings, like infix-r2s
 if [ -n "$IMAGE_ID" ]; then
    NAME="$IMAGE_ID"
 else
@@ -42,7 +36,7 @@ if [ "$SIGN_ENABLED" = "y" ]; then
    $common/sign.sh $BR2_ARCH $SIGN_KEY

    ixmsg "Creating RAUC Update Bundle"
-    $common/mkrauc.sh "$NAME$(ver)" $INFIX_COMPATIBLE $SIGN_KEY
+    $common/mkrauc.sh "$NAME$(ver)" $BR2_ARCH $SIGN_KEY
 fi

 load_cfg DISK_IMAGE
@@ -66,14 +60,6 @@ if [ "$DISK_IMAGE" = "y" ]; then
    $common/mkdisk.sh -a $BR2_ARCH -n $diskimg -s $DISK_IMAGE_SIZE $bootcfg
 fi

-load_cfg SDCARD_AUX
-if [ "$SDCARD_AUX" = "y" ]; then
-    ixmsg "Creating initial rauc.status"
-    $common/mkrauc-status.sh "$BINARIES_DIR/${NAME}.pkg" >"$BINARIES_DIR/rauc.status"
-    ixmsg "Creating aux.ext4 for sdcard.img"
-    $common/mkaux.sh
-fi
-
 load_cfg GNS3_APPLIANCE
 if [ "$GNS3_APPLIANCE" = "y" ]; then
    ixmsg "Creating GNS3 Appliance, $GNS3_APPLIANCE_RAM MiB with $GNS3_APPLIANCE_IFNUM ports"
@@ -90,12 +76,12 @@ if [ "$BR2_TARGET_ROOTFS_SQUASHFS" = "y" ]; then
    rel=$(ver)
    ln -sf rootfs.squashfs "$BINARIES_DIR/${NAME}${rel}.img"
    if [ -n "$rel" ]; then
-	ln -sf "${NAME}${rel}.img" "$BINARIES_DIR/${NAME}.img"
+	ln -sf "$BINARIES_DIR/${NAME}${rel}.img" "$BINARIES_DIR/${NAME}.img"
    fi
 fi

 # Menuconfig support for modifying Qemu args in release tarballs
-cp "$BR2_EXTERNAL_INFIX_PATH/board/common/rootfs/usr/bin/onieprom" "$BINARIES_DIR/"
+cp "$BR2_EXTERNAL_INFIX_PATH/board/common/rootfs/bin/onieprom" "$BINARIES_DIR/"
 cp "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/qemu.sh" "$BINARIES_DIR/"
 sed -e "s/@ARCH@/QEMU_$BR2_ARCH/" \
    -e "s/@DISK_IMG@/$diskimg/"   \
@@ -105,6 +91,3 @@ rm -f "$BINARIES_DIR/qemu.cfg"
 CONFIG_="CONFIG_" BR2_CONFIG="$BINARIES_DIR/qemu.cfg" \
       "$O/build/buildroot-config/conf" --olddefconfig "$BINARIES_DIR/Config.in"
 rm -f "$BINARIES_DIR/qemu.cfg.old" "$BINARIES_DIR/.config.old"
-
-# Quick intro for beginners, with links to more information
-cp "$BR2_EXTERNAL_INFIX_PATH/board/common/README.txt" "$BINARIES_DIR/"
@@ -4,10 +4,6 @@ choice
 	prompt "Target Architecture"
 	default @ARCH@

-config QEMU_riscv64
-	bool "risv64"
-	select QEMU_ARCH_IS_64
-
 config QEMU_x86_64
 	bool "x86_64"
 	select QEMU_ARCH_IS_64
@@ -66,7 +62,7 @@ endchoice

 config QEMU_MACHINE
 	string "Select emulated machine"
-	default "qemu-system-aarch64 -M virt,accel=kvm:tcg -cpu max,pauth-impdef=on" if QEMU_aarch64
+	default "qemu-system-aarch64 -M virt,accel=kvm:tcg -cpu max" if QEMU_aarch64
 	default "qemu-system-x86_64  -M pc,accel=kvm:tcg   -cpu max" if QEMU_x86_64
 	help
 	  You should not have to change this setting, although you may
@@ -106,27 +102,21 @@ config QEMU_DTB_EXTEND
 	depends on QEMU_LOADER_UBOOT
 	default y if QEMU_aarch64

-if QEMU_ROOTFS_INITRD
-
 config QEMU_RW
 	string "Writable /cfg layer"
 	depends on QEMU_ROOTFS_INITRD
 	default "cfg.ext4"

 config QEMU_RW_VAR_OPT
-	bool "Separate writable /var"
+	bool "Separate writable /var (256MB)"

 if QEMU_RW_VAR_OPT
-config QEMU_RW_VAR_SIZE
-	string "Size of /var"
-	default "256M"
+
 config QEMU_RW_VAR
 	string "Writable /var layer"
 	default "var.ext4"
 endif

-endif
-
 config QEMU_VPD
 	bool "Emulate a Vital Product Data (VPD) Memory"

@@ -141,55 +131,10 @@ config QEMU_APPEND
 config QEMU_EXTRA
 	string "Extra QEMU options"

-
-comment "RTC"
-
-choice
-	prompt "Mode"
-	default QEMU_RTC_UTC
-
-config QEMU_RTC_UTC
-	bool "UTC"
-
-config QEMU_RTC_LOCAL
-	bool "Local time"
-
-config QEMU_RTC_RANDOM
-	bool "Random"
-
-endchoice
-
-choice
-	prompt "Clock"
-	default QEMU_CLOCK_HOST
-
-config QEMU_CLOCK_HOST
-	bool "Host clock"
-
-config QEMU_CLOCK_RT
-	bool "Independent (monotonic)"
-
-config QEMU_CLOCK_VM
-	bool "Virtual"
-
-endchoice
-
-config QEMU_RTC
-	string
-	default "utc"       if QEMU_RTC_UTC
-	default "localtime" if QEMU_RTC_LOCAL
-	default "random"    if QEMU_RTC_RANDOM
-
-config QEMU_CLOCK
-	string
-	default "host"      if QEMU_CLOCK_HOST
-	default "rt"        if QEMU_CLOCK_RT
-	default "vm"        if QEMU_CLOCK_VM
-
 comment "Networking"

 choice
-     prompt "Network Mode"
+     prompt "Mode"
     default QEMU_NET_USER

 config QEMU_NET_NONE
@@ -204,9 +149,6 @@ config QEMU_NET_USER
 config QEMU_NET_TAP
     bool "TAP"

-config QEMU_NET_ROCKER
-     bool "Rocker"
-
 endchoice

 config QEMU_NET_MODEL
@@ -232,8 +174,3 @@ config QEMU_NET_TAP_N
 	int "Number of TAPs"
 	depends on QEMU_NET_TAP
 	default 1
-
-config QEMU_NET_PORTS
-	int "Number of Rocker switch ports"
-	depends on QEMU_NET_ROCKER
-	default 10
@@ -17,10 +17,9 @@
 #
 #    ./qemu.sh -h
 #
-# shellcheck disable=SC3037

 # Local variables
-imgdir=$(readlink -f "$(dirname "$0")")
+imgdir=$(readlink -f $(dirname "$0"))
 prognm=$(basename "$0")

 usage()
@@ -31,7 +30,6 @@ usage()
    echo "Options:"
    echo "  -c     Run menuconfig to change Qemu settings"
    echo "  -h     This help text"
-    echo "  -k     Keep generated qemu.run script (name shown at end)"
    echo
    echo "Arguments:"
    echo "  ARGS1  Args before the '--' separator are for kernel space"
@@ -56,20 +54,19 @@ die()

 load_qemucfg()
 {
-    tmp=$(mktemp -p /tmp)
+    local tmp=$(mktemp -p /tmp)

-    grep ^CONFIG_QEMU_ "$1" >"$tmp"
-    # shellcheck disable=SC1090
-    .  "$tmp"
-    rm "$tmp"
+    grep ^CONFIG_QEMU_ $1 >$tmp
+    .  $tmp
+    rm $tmp

    [ "$CONFIG_QEMU_MACHINE" ] || die "Missing QEMU_MACHINE"
    [ "$CONFIG_QEMU_ROOTFS"  ] || die "Missing QEMU_ROOTFS"

-    [ -n "$CONFIG_QEMU_KERNEL" ] && [ -n "$CONFIG_QEMU_BIOS" ] \
+    [ "$CONFIG_QEMU_KERNEL" -a "$CONFIG_QEMU_BIOS" ] \
 	&& die "QEMU_KERNEL conflicts with QEMU_BIOS"

-    [ -z "$CONFIG_QEMU_KERNEL" ] && [ -z "$CONFIG_QEMU_BIOS" ] \
+    [ ! "$CONFIG_QEMU_KERNEL" -a ! "$CONFIG_QEMU_BIOS" ] \
 	&& die "QEMU_KERNEL or QEMU_BIOS must be set"
 }

@@ -96,7 +93,7 @@ append_args()

    if [ "$CONFIG_QEMU_ROOTFS_INITRD" = "y" ]; then
 	# Size of initrd, rounded up to nearest kb
-	size=$((($(stat -c %s "$CONFIG_QEMU_ROOTFS") + 1023) >> 10))
+	local size=$((($(stat -c %s $CONFIG_QEMU_ROOTFS) + 1023) >> 10))
 	echo -n "root=/dev/ram0 ramdisk_size=${size} "
    elif [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
 	echo -n "root=PARTLABEL=primary "
@@ -149,22 +146,13 @@ usb_args()
    USBSTICK="usb.vfat"
    if ! [ -f $USBSTICK ]; then
 	dd if=/dev/zero of=${USBSTICK} bs=8M count=1 >/dev/null 2>&1
-
-	if command -v mkfs.vfat >/dev/null; then
-	    mkfs.vfat -n "log" $USBSTICK >/dev/null 2>&1
-	else
-	    if command -v mkfs.exfat >/dev/null; then
-		mkfs.exfat -L "log" $USBSTICK >/dev/null 2>&1
-	    fi
-	fi
+	mkfs.vfat $USBSTICK >/dev/null 2>&1
    fi
-
    echo -n "-drive if=none,id=usbstick,format=raw,file=$USBSTICK "
    echo -n "-usb "
    echo -n "-device usb-ehci,id=ehci "
    echo -n "-device usb-storage,bus=ehci.0,drive=usbstick "
 }
-
 rw_args()
 {
    [ "$CONFIG_QEMU_RW" ] ||  return
@@ -184,7 +172,7 @@ rw_args()

    if [ "$CONFIG_QEMU_RW_VAR_OPT" ]; then
 	if ! [ -f "$CONFIG_QEMU_RW_VAR" ]; then
-	    dd if=/dev/zero of="$CONFIG_QEMU_RW_VAR" bs=$CONFIG_QEMU_RW_VAR_SIZE count=1 >/dev/null 2>&1
+	    dd if=/dev/zero of="$CONFIG_QEMU_RW_VAR" bs=256M count=1 >/dev/null 2>&1
 	    mkfs.ext4 -L var "$CONFIG_QEMU_RW_VAR" >/dev/null 2>&1
 	fi

@@ -201,24 +189,13 @@ host_args()

 net_dev_args()
 {
-    name="e$1"
-    mac=$(printf "02:00:00:00:00:%02x" "$1")
+    local name="e$1"
+    local mac=$(printf "02:00:00:00:00:%02x" $1)

    echo -n "-device $CONFIG_QEMU_NET_MODEL,netdev=$name,mac=$mac "
    echo "$name	$mac" >>"$mactab"
 }

-rocker_port_args()
-{
-    sw=$1
-    port=$2
-    name="sw${sw}p${port}"
-    mac=$(printf "02:00:00:00:%02x:%02x" "$sw" "$port")
-
-    echo -n "-netdev tap,id=$name,ifname=$name,script=no,downscript=no "
-    echo "$name	$mac" >> "$mactab"
-}
-
 net_args()
 {
    # Infix will pick up this file via fwcfg and install it to /etc
@@ -230,25 +207,14 @@ net_args()
 	echo -n "-netdev bridge,id=e1,br=$CONFIG_QEMU_NET_BRIDGE_DEV "
 	net_dev_args 1
    elif [ "$CONFIG_QEMU_NET_TAP" = "y" ]; then
-	for i in $(seq 1 "$CONFIG_QEMU_NET_TAP_N"); do
+	for i in $(seq 1 $(($CONFIG_QEMU_NET_TAP_N))); do
 	    echo -n "-netdev tap,id=e$i,ifname=qtap$i "
-	    net_dev_args "$i"
-	done
-    elif [ "$CONFIG_QEMU_NET_ROCKER" = "y" ]; then
-	sw=sw0			# Only single switch support atm.
-	echo -n "-device '{\"driver\":\"rocker\", \"name\":\"${sw}\", "
-	echo -n "\"fp_start_macaddr\":\"02:00:00:00:00:01\", "
-	echo -n "\"ports\":["
-	for i in $(seq 1 "$CONFIG_QEMU_NET_PORTS"); do
-	    [ "$i" -gt 1 ] && echo -n ", "
-	    echo -n "\"${sw}p${i}\""
-	done
-	echo -n "]}' "
-	for i in $(seq 1 "$CONFIG_QEMU_NET_PORTS"); do
-	    rocker_port_args 0 "$i"
+	    net_dev_args $i
 	done
    elif [ "$CONFIG_QEMU_NET_USER" = "y" ]; then
+	local useropts=
 	[ "$CONFIG_QEMU_NET_USER_OPTS" ] && useropts=",$CONFIG_QEMU_NET_USER_OPTS"
+
 	echo -n "-netdev user,id=e1${useropts} "
 	net_dev_args 1
    else
@@ -286,48 +252,17 @@ EOF

 wdt_args()
 {
-    echo -n "-device i6300esb "
-}
-
-random_date()
-{
-    rand=$(($(date +%_s) * $$ + $(date +%N | sed 's/^0*//')))
-    when=$((rand % 7258118400)) # 1970 - 2200
-    date -d "@$when" +"%Y-%m-%dT%H:%M:%S"
-}
-
-rtc_args()
-{
-    rtc="${CONFIG_QEMU_RTC:-utc}"
-    clock="${CONFIG_QEMU_CLOCK:-host}"
-    if [ "$rtc" = "random" ]; then
-	rtc=$(random_date)
-    fi
-
-    echo -n "-rtc base=$rtc,clock=$clock"
-}
-
-gdb_args()
-{
-    echo -n "-chardev socket,id=gdbqemu,path=gdbqemu.sock,server=on,wait=off "
-    echo -n "-gdb chardev:gdbqemu"
+    echo -n "-device i6300esb -rtc clock=host"
 }

 run_qemu()
 {
    if [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
-	if ! qemu-img check "${CONFIG_QEMU_ROOTFS}.qcow2"; then
-	    rm -f "${CONFIG_QEMU_ROOTFS}.qcow2"
-	fi
-	if [ ! -f "${CONFIG_QEMU_ROOTFS}.qcow2" ]; then
-	    echo "Creating qcow2 disk image for Qemu ..."
-	    qemu-img create -f qcow2 -o backing_file="$CONFIG_QEMU_ROOTFS" \
-		     -F raw "${CONFIG_QEMU_ROOTFS}.qcow2" > /dev/null
-	fi
+	 qemu-img create -f qcow2 -o backing_file=$CONFIG_QEMU_ROOTFS -F raw $CONFIG_QEMU_ROOTFS.qcow2 > /dev/null
    fi
-
-    read -r qemu <<EOF
-	$CONFIG_QEMU_MACHINE -nodefaults -m $CONFIG_QEMU_MACHINE_RAM \
+    local qemu
+    read qemu <<EOF
+	$CONFIG_QEMU_MACHINE -m $CONFIG_QEMU_MACHINE_RAM \
 	  $(loader_args) \
 	  $(rootfs_args) \
 	  $(serial_args) \
@@ -336,32 +271,14 @@ run_qemu()
 	  $(host_args) \
 	  $(net_args) \
 	  $(wdt_args) \
-	  $(rtc_args) \
 	  $(vpd_args) \
-	  $(gdb_args) \
 	  $CONFIG_QEMU_EXTRA
 EOF
-    # Save resulting command to a script, because I cannot for the life
-    # of me figure out how to embed the JSON snippet for Rocker and run
-    # it here without issues, spent way too much time on it -- Joachim
-    run=$(mktemp -t run.qemu.XXX)
-    echo "#!/bin/sh" > "$run"
-    if [ "$CONFIG_QEMU_KERNEL" ]; then
-	echo "$qemu -append \"$(append_args)\" $*" >> "$run"
-    else
-	echo "$qemu $*" >> "$run"
-    fi
-    chmod +x "$run"

-    echo "Starting Qemu  ::  Ctrl-a x -- exit | Ctrl-a c -- toggle console/monitor"
-    line=$(stty -g)
-    stty raw
-    $run
-    stty "$line"
-    if [ -n "$keep" ]; then
-	echo "Keeping generated qemu.run script: $run"
+    if [ "$CONFIG_QEMU_KERNEL" ]; then
+	$qemu -append "$(append_args)" "$@"
    else
-	rm "$run"
+	$qemu "$@"
    fi
 }

@@ -398,7 +315,7 @@ generate_dot()
    hostports="<qtap1> qtap1"
    targetports="<e1> e1"
    edges="host:qtap1 -- target:e1 [kind=mgmt];"
-    for tap in $(seq 2 $((CONFIG_QEMU_NET_TAP_N - 1))); do
+    for tap in $(seq 2 $(($CONFIG_QEMU_NET_TAP_N - 1))); do
 	hostports="$hostports | <qtap$tap> qtap$tap "
 	targetports="$targetports | <e$tap> e$tap "
 	edges="$edges host:qtap$tap -- target:e$tap;"
@@ -438,8 +355,7 @@ menuconfig()
    exec kconfig-mconf Config.in
 }

-scriptdir=$(dirname "$(readlink -f "$0")")
-cd "$scriptdir" || (echo "Failed cd to $scriptdir"; exit 1)
+cd $(dirname $(readlink -f "$0"))

 while [ "$1" != "" ]; do
    case $1 in
@@ -449,9 +365,6 @@ while [ "$1" != "" ]; do
 	-h)
 	    usage
 	    ;;
-	-k)
-	    keep=true
-	    ;;
 	*)
 	    break
    esac
@@ -472,4 +385,8 @@ fi

 generate_dot

+echo "Starting Qemu  ::  Ctrl-a x -- exit | Ctrl-a c -- toggle console/monitor"
+line=$(stty -g)
+stty raw
 run_qemu $(dtb_args)
+stty "$line"
@@ -19,5 +19,5 @@ if [ -z "$OUTPUT" ]; then
 fi

 umask 0177
-echo "$password" | mkpasswd -s > "$OUTPUT"
+echo "$password" | mkpasswd > "$OUTPUT"
 exit 0
@@ -0,0 +1 @@
+/sbin/ip
@@ -1,4 +1,24 @@
 #!/bin/sh
+
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+set -e
+
 # Command line arguments:
 #   $1 event that happened:
 #          BIND:     Successfully claimed address
@@ -10,27 +30,59 @@

 PATH="$PATH:/usr/bin:/usr/sbin:/bin:/sbin"

-log()
-{
-    logger -I $$ -t zeroconf -p user.notice "$*"
-}
+# Use a different metric for each interface, so that we can set
+# identical routes to multiple interfaces.

-case "$1" in
-    BIND)
-        ip addr flush dev "$2" proto random
-        ip addr add "$3"/16 brd 169.254.255.255 scope link dev "$2" proto random
-	log "set ipv4ll $3 on iface $2"
-        ;;
+METRIC=$((1000 + `cat "/sys/class/net/$2/ifindex" 2>/dev/null || echo 0`))

-    CONFLICT|UNBIND|STOP)
-        ip addr flush dev "$2" proto random
-	log "clr ipv4ll on iface $2"
-        ;;
+if [ -x /bin/ip -o -x /sbin/ip ] ; then

-    *)
-        log "Unknown event $1 on iface $2"
-        exit 1
-        ;;
-esac
+    # We have the Linux ip tool from the iproute package
+
+    case "$1" in
+        BIND)
+            ip addr flush dev "$2" label "$2:avahi"
+            ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" proto 6
+            ip route add default dev "$2" metric "$METRIC" scope link proto zeroconf ||:
+            ;;
+
+        CONFLICT|UNBIND|STOP)
+            ip route del default dev "$2" metric "$METRIC" scope link ||:
+            ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
+            ;;
+
+        *)
+            echo "Unknown event $1" >&2
+            exit 1
+            ;;
+    esac
+
+elif [ -x /bin/ifconfig -o -x /sbin/ifconfig ] ; then
+
+    # We have the old ifconfig tool
+
+    case "$1" in
+        BIND)
+            ifconfig "$2:avahi" inet "$3" netmask 255.255.0.0 broadcast 169.254.255.255 up
+            route add default dev "$2:avahi" metric "$METRIC" ||:
+            ;;
+
+        CONFLICT|STOP|UNBIND)
+            route del default dev "$2:avahi" metric "$METRIC" ||:
+            ifconfig "$2:avahi" down
+            ;;
+
+        *)
+            echo "Unknown event $1" >&2
+            exit 1
+            ;;
+    esac
+
+else
+
+    echo "No network configuration tool found." >&2
+    exit 1
+
+fi

 exit 0
@@ -1,4 +1,3 @@
-# Hey Emacs, this is -*-sh-*-
 # System-wide .bashrc file for interactive bash(1) shells.

 # If not running interactively, don't do anything
@@ -14,30 +13,3 @@ export PROMPT_COMMAND=prompt_command
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
-
-log()
-{
-    local fn="/var/log/syslog"
-    [ -n "$1" ] && fn="/var/log/$1"
-    less +G "$fn"
-}
-
-follow()
-{
-    local fn="/var/log/syslog"
-    [ -n "$1" ] && fn="/var/log/$1"
-    tail -F "$fn"
-}
-
-_logfile_completions()
-{
-    local cur=${COMP_WORDS[COMP_CWORD]}
-    local files=$(compgen -f -- "/var/log/$cur")
-    COMPREPLY=()
-    for file in $files; do
-        [ -f "$file" ] && COMPREPLY+=("$(basename "$file")")
-    done
-}
-
-complete -F _logfile_completions log
-complete -F _logfile_completions follow
@@ -1 +0,0 @@
-CONFD_TIMEOUT=60
@@ -1,2 +0,0 @@
-# --log-level debug
-OSPFD_ARGS="-A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf --log syslog"
@@ -1 +0,0 @@
-RAUC_ARGS="-s"
@@ -1,2 +0,0 @@
-# --log-level debug
-ZEBRA_ARGS="-A 127.0.0.1 -u frr -g frr --log syslog "
@@ -3,19 +3,16 @@
 # and similar events feed servers and configuration to dnsmasq.
 domain-needed

-# Allow configuration and cache clear over D-Bus
-enable-dbus
+# Only listen to loopback (local system)
+interface=lo
+bind-dynamic
+#listen-address=127.0.0.1,::1

-# Disable the following dnsmasq default DHCP options
-#dhcp-option=option:netmask
-#dhcp-option=28			# option:broadcast
-#dhcp-option=option:domain-name
-dhcp-option=option:router
-dhcp-option=option:dns-server
-dhcp-option=12			# option:hostname
+enable-dbus

 # Generated by openresolv
 resolv-file=/var/lib/misc/resolv.conf

 # Include all files in a directory which end in .conf
 conf-dir=/etc/dnsmasq.d/,*.conf
+
@@ -1,3 +1,3 @@
-task name:ixinit log:tag:ixinit [S] <pid/syslogd> \
-	/usr/libexec/finit/runparts -bp /usr/libexec/infix/init.d \
-	-- Probing system
+run [S] log:console   /libexec/infix/probe -- Probing system information
+run [S] <pid/syslogd> /libexec/infix/sysctl-sync-ip-conf --
+run [S] <pid/syslogd> /libexec/infix/nameif -- Probing network interfaces
@@ -1,7 +1,4 @@
-# Start a container instance (%i) and redirect logs to /log/container
-# Give podman enough time to properly shut down the container.  Every
-# time we start a container we run the setup stage, disable the Finit
-# timeout to allow the setup stage to run to completion.
-sysv    log:prio:local1,tag:%i kill:10 pid:!/run/container:%i.pid \
-	pre:0,/usr/sbin/container cleanup:0,/usr/sbin/container   \
-	[2345] <!> :%i container -n %i -- container %i
+service :%i pid:!/run/k8s-logger-%i.pid <usr/container:%i> \
+	[2345] k8s-logger -cni %i -f local1 /run/containers/%i.fifo -- Logger for container %i
+sysv    :%i pid:!/run/container:%i.pid <pid/k8s-logger:%i> kill:10 \
+	[2345] container -n %i -- container %i
@@ -1 +1 @@
-task [S] <service/confd/ready> /usr/libexec/infix/mkcert -- Verifying self-signed https certificate
+task [S] <service/confd/ready> /libexec/infix/mkcert -- Verifying self-signed https certificate
@@ -1,9 +0,0 @@
-# A single mstpd instance can manage multiple bridges, which are
-# dynamically added/removed by the kernel via the /sbin/bridge-stp
-# usermode helper. We use a manual service so that confd can
-# enable/disable it without an initctl barrier, since it needs to
-# already be running when a bridge interface with spanning tree
-# enabled is created.
-
-service env:-/etc/default/mstpd manual:yes \
-	 [S0123456789] mstpd $MSTPD_ARGS -- Spanning Tree daemon
@@ -1,3 +0,0 @@
-service name:rousette notify:none log <pid/confd> env:/etc/default/confd \
-	[12345] rousette --syslog -t $CONFD_TIMEOUT \
-	-- RESTCONF server
@@ -1,4 +0,0 @@
-# Use <pid/syslogd> as barrier for other system tasks and service that
-# rely on modules, firmware, and device nodes to be ready.
-service if:udevd nowarn env:-/etc/default/sysklogd <run/udevadm:post/success> \
-	[S0123456789] syslogd -F $SYSLOGD_ARGS -- System log daemon
@@ -1 +1 @@
-service [2345] <!> ttyd -i lo -W -p 8001 login -- Web terminal daemon (ttyd)
+service [2345] <!> ttyd -i lo -p 8001 login -- Web terminal daemon (ttyd)
@@ -1 +0,0 @@
-../available/mstpd.conf
@@ -1,9 +0,0 @@
-! Default settings for staticd, used for both
-! confd generated routes, udhcpc and zeroconf
-frr defaults traditional
-hostname Router
-password zebra
-enable password zebra
-no log unique-id
-log syslog informational
-log facility local2
@@ -7,17 +7,16 @@ tmpfs		/dev/shm	tmpfs		mode=0777		0	0
 proc		/proc		proc		defaults		0	0
 tmpfs		/tmp		tmpfs		mode=1777,nosuid,nodev	0	0
 tmpfs		/run		tmpfs		mode=0755,nosuid,nodev	0	0
-tmpfs		/media		tmpfs		mode=1755,nosuid,nodev	0	0
 sysfs		/sys		sysfs		defaults		0	0
 debugfs	/sys/kernel/debug	debugfs		nofail			0	0
 cfgfs		/config		configfs	nofail,noauto		0	0

 # The chosen backing storage for the overlays placed on /cfg, /etc,
-# /home, /root, and /var, are determined dynamically by /usr/libexec/infix/mnt
+# /home, /root, and /var, are determined dynamically by /libexec/infix/mnt
 # depending on the available devices.
 mnttmp		/mnt/tmp	tmpfs		defaults			0	0
 LABEL=aux	/mnt/aux	auto		noatime,nodiratime,noauto	0	0
 LABEL=var	/mnt/var	auto		noatime,nodiratime,noauto	0	0
 LABEL=cfg	/mnt/cfg	auto		noatime,nodiratime,noauto	0	0
 hostfs		/mnt/host	9p		cache=none,msize=16384,noauto	0	0
-/usr/libexec/infix/mnt#	/cfg	helper		none				0	0
+/libexec/infix/mnt# /cfg	helper		none				0	0
@@ -1 +0,0 @@
-/var/lib/dbus/machine-id
@@ -1,6 +1 @@
-# Micro GNU Emacs default configuration file
-auto-indent-mode
-auto-fill-mode
 make-backup-files 0
-require-final-newline T
-set-fill-column 72
@@ -1,4 +1,4 @@
 .-------.
 |  . .  | Infix -- a Network Operating System
-|-. v .-| https://kernelkit.org
+|-. v .-| https://kernelkit.github.io
 '-'---'-'
@@ -24,6 +24,4 @@ server {
 	root   html;
 	index  index.html index.htm;
    }
-
-    include /etc/nginx/app/*.conf;
 }
@@ -5,6 +5,14 @@ server {
    include      ssl.conf;

    location / {
-        include /etc/nginx/netbrowse.conf;
+	proxy_pass http://127.0.0.1:8000;
+	proxy_http_version 1.1;
+	proxy_set_header Upgrade $http_upgrade;
+	proxy_set_header Connection 'upgrade';
+	proxy_set_header Host $host;
+	proxy_set_header X-Real-IP $remote_addr;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_set_header X-Forwarded-Proto $scheme;
+	proxy_redirect off;
    }
 }
@@ -1,6 +0,0 @@
-location /netbrowse/ {
-    return 301 /netbrowse;
-}
-location /netbrowse {
-    include /etc/nginx/netbrowse.conf;
-}
@@ -1,9 +0,0 @@
-proxy_pass http://127.0.0.1:8000;
-proxy_http_version 1.1;
-proxy_set_header Upgrade $http_upgrade;
-proxy_set_header Connection 'upgrade';
-proxy_set_header Host $host;
-proxy_set_header X-Real-IP $remote_addr;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;
-proxy_redirect off;
@@ -1,8 +0,0 @@
-# /telemetry/optics is for streaming (not used atm)
-location ~ ^/(restconf|yang|.well-known)/ {
-    grpc_pass grpc://[::1]:10080;
-    grpc_set_header Host $host;
-    grpc_set_header X-Real-IP $remote_addr;
-    grpc_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    grpc_set_header X-Forwarded-Proto $scheme;
-}
@@ -1,19 +0,0 @@
-#%PAM-1.0
-auth        requisite   pam_nologin.so
-auth	[success=1 default=ignore]	pam_unix.so nullok
-auth	requisite			pam_deny.so
-auth	required			pam_permit.so
-
-account    requisite   pam_nologin.so
-account	   [success=1 default=ignore]	pam_unix.so
-account	   requisite			pam_deny.so
-account	   required			pam_permit.so
-
-password	[success=1 default=ignore]	pam_unix.so
-password	requisite			pam_deny.so
-password	required			pam_permit.so
-
-session     required    pam_loginuid.so
-session     include     common-session
-session     optional    pam_keyinit.so   force revoke
-session     optional    pam_motd.so
@@ -1,19 +0,0 @@
-#%PAM-1.0
-auth        requisite   pam_nologin.so
-auth	[success=1 default=ignore]	pam_unix.so nullok
-auth	requisite			pam_deny.so
-auth	required			pam_permit.so
-
-account    requisite   pam_nologin.so
-account	   [success=1 default=ignore]	pam_unix.so
-account	   requisite			pam_deny.so
-account	   required			pam_permit.so
-
-password	[success=1 default=ignore]	pam_unix.so
-password	requisite			pam_deny.so
-password	required			pam_permit.so
-
-session     required    pam_loginuid.so
-session     include     common-session
-session     optional    pam_keyinit.so   force revoke
-session     optional    pam_motd.so
@@ -1 +1,2 @@
 alias cli='clish'
+alias cfg='sysrepocfg -f json'
@@ -6,7 +6,6 @@ alias ls='ls --color=auto'
 export EDITOR=/usr/bin/edit
 export VISUAL=/usr/bin/edit
 export LESS="-P %f (press h for help or q to quit)"
-export LESSOPEN="|/usr/bin/lesspipe.sh %s"
 alias vim='vi'
 alias view='vi -R'
 alias emacs='mg'
@@ -1,4 +1 @@
-# Allow client to pass locale environment
-AcceptEnv LANG LC_*
-
 Include /etc/ssh/sshd_config.d/*.conf
@@ -0,0 +1 @@
+Subsystem cli /usr/bin/klish
@@ -1 +0,0 @@
-Subsystem	sftp	/usr/libexec/sftp-server
@@ -0,0 +1,3 @@
+HostKey /var/lib/ssh/ssh_host_rsa_key
+HostKey /var/lib/ssh/ssh_host_ecdsa_key
+HostKey /var/lib/ssh/ssh_host_ed25519_key
@@ -0,0 +1,2 @@
+net.ipv4.ip_forward=1
+net.ipv6.conf.all.forwarding=1
@@ -1,32 +1 @@
-# Router defaults
-net.ipv4.conf.default.rp_filter=0
-net.ipv4.conf.all.rp_filter=0
-
-net.ipv4.conf.lo.rp_filter=0
-
-net.ipv4.icmp_errors_use_inbound_ifaddr=1
-net.ipv4.conf.all.ignore_routes_with_linkdown=1
-
-# Use neigh information on selection of nexthop for multipath hops
-net.ipv4.fib_multipath_use_neigh=1
-
-# Sane ARP defaults for a switch/router
-net.ipv4.conf.default.arp_announce=2
-net.ipv4.conf.all.arp_announce=2
-
-net.ipv4.conf.default.arp_notify=1
-net.ipv4.conf.all.arp_notify=1
-
-net.ipv4.conf.default.arp_ignore=1
-net.ipv4.conf.all.arp_ignore=1
-
-# IP Routing
-net.ipv4.ip_forward=1
-net.ipv4.ip_forward_update_priority=0
-
 net.ipv4.conf.all.forwarding=0
-net.ipv4.conf.default.forwarding=0
-
-# Multicast group subscriptions
-net.ipv4.igmp_max_memberships=1000
-net.ipv4.neigh.default.mcast_solicit=10
@@ -1,23 +1,5 @@
-# Router defaults
-net.ipv6.route.max_size=131072
-net.ipv6.conf.all.ignore_routes_with_linkdown=1
-
-# IP Routing is disabled by default, enabled globally, and per
-# interface, for each interface in confd.  See also accept_ra.
-net.ipv6.conf.all.forwarding=0
+net.ipv6.conf.all.forwarding=1
 net.ipv6.conf.default.forwarding=0
-
-# Accept router advertisements even when forwarding is enabled
-net.ipv6.conf.all.accept_ra=2
-net.ipv6.conf.default.accept_ra=2
-
-# IPv6 SLAAC
 net.ipv6.conf.all.autoconf=0
 net.ipv6.conf.default.autoconf=0
-
-# Keep permanent addresses on an admin down
-net.ipv6.conf.all.keep_addr_on_down=1
 net.ipv6.conf.default.keep_addr_on_down=1
-
-# Multicast group subscriptions
-net.ipv6.mld_max_msf=512
@@ -1,145 +0,0 @@
-Many of the defaults here are are taken from the Frr recommendations [1].
-Below are relevant excerpts from the kernel documentation.
-
-
-accept_ra, accept Router Advertisements; autoconfigure using them, also
-           determines whether or not to transmit Router Solicitations.
-           If and only if the functional setting is to accept Router
-           Advertisements, Router Solicitations will be transmitted.
-
-  0 - Do not accept Router Advertisements.
-
-  1 - Accept Router Advertisements if forwarding is disabled.
-
-  2 - Overrule forwarding behaviour. Accept Router Advertisements even
-      if forwarding is enabled.
-
-  Default:
-    - enabled if local forwarding is disabled
-    - disabled if local forwarding is enabled
-
-
-accept_ra_pinfo, learn Prefix Information in Router Advertisement.
-
-   Default:
-    - enabled if accept_ra is enabled
-    - disabled if accept_ra is disabled
-
-
-autoconf, autoconfigure IPv6 addresses using Prefix Information in
-          Router Advertisements.
-
-   Default:
-    - enabled if accept_ra_pinfo is enabled
-    - disabled if accept_ra_pinfo is disabled
-
-
-arp_announce, define restriction level for announcing the local source
-              address from IP packets in ARP requests sent on interface:
-
-  0 - (default) Use any local address, configured on any interface
-
-  1 - Try to avoid local addresses that are not in the target’s subnet
-      for this interface.  Useful when target hosts reachable via this
-      interface require the source IP address in ARP requests to be part
-      of their logical network configured on the receiving interface.
-      When we generate the request we will check all our subnets that
-      include the target IP and will preserve the source address if it
-      is from such subnet. If there is no such subnet we select source
-      address according to the rules for level 2.
-
-  2 - Always use the best local address for this target. In this mode we
-      ignore the source address in the IP packet and try to select local
-      address that we prefer for talks with the target host. Such local
-      address is selected by looking for primary IP addresses on all our
-      subnets on the outgoing interface that include the target address.
-      If no suitable local address is found we select the first local
-      address we have on the outgoing interface or on all other
-      interfaces, with the hope we will receive reply for our request
-      and even sometimes no matter the source IP address we announce.
-
-
-arp_notify, define mode for notification of address and device changes.
-
-  0 - (default): do nothing
-  1 - generate gratuitous arp requests when device is brought up or
-      hardware address changes.
-
-
-arp_ignore, define different modes for sending replies in response to
-            received ARP requests that resolve local target addresses:
-
-  0 - (default): reply for any local target IP address, configured on
-      any interface
-
-  1 - reply only if the target IP address is a local address configured
-      on the incoming interface
-
-  2 - reply only if the target IP address is local address configured on
-      the incoming interface and both with the sender’s IP address are part
-      from same subnet on this interface
-
-  3 - do not reply for local addresses configured with scope host, only
-      resolutions for global and link addresses are replied
-
-  4-7 - reserved
-
-  8 - do not reply for all local addresses
-
-
-arp_accept, define behavior for accepting gratuitous ARP (garp) frames
-      from devices that are not already present in the ARP table:
-
-  0 - don’t create new entries in the ARP table
-
-  1 - create new entries in the ARP table
-
-  2 - create new entries only if the source IP address is in the same
-      subnet as an address configured on the interface that received
-      the garp message.
-
-  Both replies and requests type gratuitous arp will trigger the ARP
-  table to be updated, if this setting is on.  If the ARP table already
-  contains the IP address of the gratuitous arp frame, the arp table
-  will be updated regardless if this setting is on or off.
-
-
-icmp_errors_use_inbound_ifaddr
-
-  0 - (default): icmp error messages are sent with the primary address
-      of the exiting interface.
-
-  1 - the message will be sent with the primary address of the interface
-      that received the packet that caused the icmp error. This is the
-      behaviour many network administrators will expect from a router.
-      And it can make debugging complicated network layouts much easier.
-
-  Note, if no primary address exists for the interface selected, then
-  the primary address of the first non-loopback interface that has one
-  will be used regardless of this setting.
-
-
-rp_filter, reverse path source filtering:
-
-  0 - (default): no source validation.
-
-  1 - Strict mode as defined in RFC3704, 'Strict Reverse Path'.  Each
-      incoming packet is tested against the FIB and if the interface is
-      not the best reverse path the packet check will fail.  By default
-      failed packets are discarded.
-
-  2 - Loose mode as defined in RFC3704, 'Loose Reverse Path'.  Each
-      incoming packet’s source address is also tested against the FIB
-      and if the source address is not reachable via any interface the
-      packet check will fail.
-
-  Current recommended practice in RFC3704 is to enable strict mode to
-  prevent IP spoofing from DDos attacks. If using asymmetric routing or
-  other complicated routing, then loose mode is recommended.
-
-  The max value from conf/{all,interface}/rp_filter is used when doing
-  source validation on the {interface}.
-
-
-
-[1]: https://github.com/FRRouting/frr/blob/master/doc/user/Useful_Sysctl_Settings.md
@@ -1,84 +0,0 @@
-# /etc/syslog.conf - Configuration file for syslogd(8)
-#
-# For information about the format of this file, see syslog.conf(5)
-#
-
-#
-# First some standard log files.  Log by facility.
-#
-auth,authpriv.*			 /var/log/auth.log
-#*.*;auth,authpriv.none		-/var/log/syslog
-
-#cron.*				/var/log/cron.log
-#daemon.*			-/var/log/daemon.log
-kern.*				-/var/log/kern.log
-#lpr.*				-/var/log/lpr.log
-mail.*				-/var/log/mail.log
-#user.*				-/var/log/user.log
-
-#
-# Logging for the mail system.  Split it up so that
-# it is easy to write scripts to parse these files.
-#
-#mail.info			-/var/log/mail.info
-#mail.warn			-/var/log/mail.warn
-mail.err			 /var/log/mail.err
-#mail.*;mail.!=info		-/var/log/mail
-#mail,news.=info 		-/var/log/info
-
-# The tcp wrapper loggs with mail.info, we display all
-# the connections on tty12
-#
-#mail.=info			/dev/tty12
-
-#
-# Some "catch-all" log files.
-#
-#*.=debug;\
-#	auth,authpriv.none;\
-#	news.none;mail.none	-/var/log/debug
-*.=info;*.=notice;*.=warn;\
-	auth,authpriv.none;\
-	cron,daemon.none;\
-	mail,news.none		-/var/log/messages
-
-#
-# Store all critical events, except kernel logs, in critical RFC5424 format.
-# Overide global log rotation settings, rotate every 10MiB, keep 5 old logs,
-#
-#*.=crit;kern.none		/var/log/critical	;rotate=10M:5,RFC5424
-
-# Example of sending events to remote syslog server.
-# All events from notice and above, except auth, authpriv
-# and any kernel message are sent to server finlandia in
-# RFC5424 formatted output.
-#
-#*.notice;auth,authpriv.none;
-#	kern.none\		@finlandia	;RFC5424
-
-# Emergencies are sent to anyone logged in
-#
-*.=emerg			*
-
-# Priority alert and above are sent to the operator
-#
-#*.alert			root,joey
-
-#
-# Secure mode, same as -s, none(0), on(1), full(2).  When enabled
-# only logging to remote syslog server possible, with full secure
-# mode, not even that is possible.  We default to prevent syslogd
-# from opening UDP/514 and receving messages from other systems.
-#
-secure_mode 1
-
-#
-# Global log rotation, same as -r SIZE:COUNT, command line wins.
-#
-#rotate_size  1M
-#rotate_count 5
-
-#
-# Include all config files in /etc/syslog.d/
-#
-include /etc/syslog.d/*.conf
@@ -1,2 +0,0 @@
-rotate_size  1M
-rotate_count 10
@@ -1,2 +0,0 @@
-# Log critical and above to console, system likely unusable.
-*.=crit;*.=alert;*.=emerg	/dev/console
@@ -2,7 +2,7 @@ Reserved facilities for logging in various subsystems:

 - local0: rauc
 - local1: containers
- - local2: routing (frr)
+ - local2: 
 - local3: 
 - local5: 
 - local6: reserved 
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`service [12345789] log wan-monitor.sh -- WAN Health monitor`