Merge pull request #1068 from kernelkit/raspberry-pi

Raspberry pi
rpi4: Move to a board package and normal aarch64 build
2026-07-22 09:13:01 +02:00 · 2025-07-12 11:23:12 +02:00 · 2025-07-11 17:06:39 +02:00 · 2025-07-11 17:06:38 +02:00 · 2025-07-11 17:06:37 +02:00 · 2025-07-11 17:06:36 +02:00
1251 changed files with 73355 additions and 18811 deletions
@@ -33,3 +33,4 @@ Releases
   - 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
@@ -0,0 +1,26 @@
+# 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.
@@ -6,7 +6,7 @@ project on GitHub, and Discord, see <https://github.com/kernelkit>:

 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 Addiva Elektronik.
+features for dedicated products is provided by _Wires_.

-&nbsp;&nbsp; :globe_with_meridians: <https://www.addiva.se/electronics/>  
-&nbsp;&nbsp; :e-mail: <mailto:ael@addiva.se>
+&nbsp;&nbsp; :globe_with_meridians: <https://www.wires.se>  
+&nbsp;&nbsp; :e-mail: <mailto:infix@wires.se>
@@ -1,27 +1,54 @@
-name: Bob the Builder
+name: Build

 on:
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-  push:
-    branches:
-      - main
  workflow_dispatch:
    inputs:
-      minimal:
-        description: 'Build minimal defconfigs'
+      flavor:
+        description: 'Optional build flavor (e.g. _minimal)'
+        required: false
+        default: ''
+        type: string
+      parallel:
+        description: 'Massive parallel build of each image'
        required: false
        default: true
        type: boolean
+      infix_repo:
+        description: 'Repo to checkout (for spin overrides)'
+        required: false
+        default: kernelkit/infix
+        type: string
+
+
+  workflow_call:
+    inputs:
+      target:
+        required: true
+        type: string
+      name:
+        required: true
+        type: string
+      flavor:
+        required: false
+        type: string
+        default: ''
+      infix_repo:
+        required: false
+        type: string
+        default: kernelkit/infix
+
+env:
+  FLV: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.flavor || inputs.flavor }}
+  INFIX_REPO: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.infix_repo || inputs.infix_repo }}

 jobs:
  build:
-    name: Build Infix ${{ matrix.target }}
+    name: Build ${{ inputs.name }} ${{ inputs.target }}
    runs-on: [ self-hosted, latest ]
    strategy:
-      matrix:
-        target: [aarch64, x86_64]
      fail-fast: false
+    outputs:
+      build_id: ${{ steps.vars.outputs.INFIX_BUILD_ID }}
    steps:
      - name: Cleanup Build Folder
        run: |
@@ -30,34 +57,36 @@ jobs:
          rm -rf ./.??* || true
          ls -la ./

-      - uses: actions/checkout@v4
+      - name: Checkout infix repo
+        uses: actions/checkout@v4
        with:
+          repository: ${{ env.INFIX_REPO }}
+          ref: ${{ github.ref }}
          clean: true
+          fetch-depth: 0
          submodules: recursive

      - name: Set Build Variables
        id: vars
        run: |
-          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
+          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
-          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"
+
+          target=${{ inputs.target }}
+          name=${{ inputs.name }}
+          echo "dir=${name}-${target}"        >> $GITHUB_OUTPUT
+          echo "tgz=${name}-${target}.tar.gz" >> $GITHUB_OUTPUT
+          echo "flv=$FLV"              >> $GITHUB_OUTPUT
+          echo "Building target ${target}${FLV}_defconfig"
+
      - name: Restore Cache of dl/
        uses: actions/cache@v4
        with:
@@ -70,23 +99,37 @@ jobs:
        uses: actions/cache@v4
        with:
          path: .ccache/
-          key: ccache-${{ matrix.target }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          key: ccache-${{ inputs.target }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
          restore-keys: |
-            ccache-${{ matrix.target }}-
+            ccache-${{ inputs.target }}-
            ccache-

-      - name: Configure ${{ matrix.target }}${{ steps.vars.outputs.flv }}
+      - name: Configure ${{ inputs.target }}${{ steps.vars.outputs.flv }}
        run: |
-          make ${{ matrix.target }}${{ steps.vars.outputs.flv }}_defconfig
+          make ${{ inputs.target }}${{ steps.vars.outputs.flv }}_defconfig

-      - name: Unit Test ${{ matrix.target }}
+      - name: Unit Test ${{ inputs.target }}
        run: |
          make test-unit

-      - name: Build ${{ matrix.target }}${{ steps.vars.outputs.flv }}
+      - name: Prepare parallel build
+        id: parallel
        run: |
-          echo "Building ${{ matrix.target }}${{ steps.vars.outputs.flv }}_defconfig ..."
-          make
+
+          if [ "${{ ((github.event.inputs.parallel == 'true' && github.event_name == 'workflow_dispatch') || (github.ref_name != 'main' && github.event_name != 'workflow_dispatch')) }}" == "true" ]; then
+             echo "BR2_PER_PACKAGE_DIRECTORIES=y" >> output/.config
+             MAKE="make -j$((`getconf _NPROCESSORS_ONLN` / 2 + 2))"
+             echo "Building in parallel with -j$((`getconf _NPROCESSORS_ONLN` / 2 + 2))"
+          else
+             echo "Disabling parallel build"
+             MAKE="make"
+          fi
+          echo "MAKE=$MAKE" >> $GITHUB_OUTPUT
+
+      - name: Build ${{ inputs.target }}${{ steps.vars.outputs.flv }}
+        run: |
+          echo "Building ${{ inputs.target }}${{ steps.vars.outputs.flv }}_defconfig ..."
+          eval "${{ steps.parallel.outputs.MAKE }}"

      - name:  Check SBOM from Build
        run: |
@@ -107,100 +150,14 @@ jobs:
          printf "Size of output/images/: "
          ls -l output/images/

-      - name: Prepare ${{ matrix.target }} Artifact
+      - name: Prepare ${{ inputs.target }} Artifact
        run: |
          cd output/
          mv images ${{ steps.vars.outputs.dir }}
          ln -s ${{ steps.vars.outputs.dir }} images
-          tar chfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+          tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}

      - 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 [ "$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
-
-  release:
-    if: ${{github.repository_owner == 'kernelkit' && github.ref_name == 'main'}}
-    name: Upload Latest Build
-    needs: test
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          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
-          omitName: true
-          omitBody: true
-          omitBodyDuringUpdate: true
-          prerelease: true
-          tag: "latest"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          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
+          name: artifact-${{ inputs.target }}
@@ -55,7 +55,7 @@ jobs:
          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 libite-dev
+                       libuev-dev

      - name: Build dependencies
        run: |
@@ -65,6 +65,8 @@ 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,43 @@
+name: Publish latest Infix
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  publish:
+    name: Upload Latest Build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          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
+          omitName: true
+          omitBody: true
+          omitBodyDuringUpdate: true
+          prerelease: true
+          tag: "latest"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          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
@@ -85,22 +85,28 @@ jobs:
          cd output/
          mv images ${{ steps.vars.outputs.dir }}
          ln -s ${{ steps.vars.outputs.dir }} images
-          tar chfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+          tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}

          mv legal-info legal-info-${{ matrix.target }}-${{ steps.vars.outputs.ver }}
-          tar chfz legal-info-${{ matrix.target }}-${{ steps.vars.outputs.ver }}.tar.gz 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 }}

      - uses: actions/upload-artifact@v4
        with:
          name: artifact-${{ matrix.target }}
          path: output/*.tar.gz

+      - uses: actions/upload-artifact@v4
+        with:
+          name: artifact-disk-image-${{ matrix.target }}
+          path: output/images/*.qcow2
+
  release:
    name: Release Infix ${{ github.ref_name }}
    needs: build
    runs-on: [ self-hosted, release ]
    permissions:
      contents: write
+      discussions: write
    steps:
      - uses: actions/checkout@v4
        with:
@@ -115,12 +121,14 @@ 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
@@ -138,6 +146,11 @@ jobs:
          for file in *.tar.gz; do
              sha256sum $file > $file.sha256
          done
+          if ls *.qcow2 &>/dev/null; then
+            for file in *.qcow2; do
+              sha256sum "$file" > "$file.sha256"
+            done
+          fi

      - name: Extract ChangeLog entry ...
        run: |
@@ -150,9 +163,9 @@ jobs:
          name: Infix ${{ github.ref_name }}
          prerelease: ${{ steps.rel.outputs.pre }}
          makeLatest: ${{ steps.rel.outputs.latest }}
-          discussionCategory: Releases
+          discussionCategory: ${{ steps.rel.outputs.cat }}
          bodyFile:  release.md
-          artifacts: "*.tar.gz*"
+          artifacts: "*.tar.gz*,*.qcow2*"

      - name: Summary
        run: |
@@ -0,0 +1,116 @@
+name: Test Infix
+
+on:
+  workflow_dispatch:
+    inputs:
+      infix_repo:
+        description: 'Repo to checkout (for spin overrides)'
+        required: false
+        default: kernelkit/infix
+        type: string
+
+  workflow_call:
+    inputs:
+      target:
+        required: true
+        type: string
+      name:
+        required: true
+        type: string
+      flavor:
+        required: false
+        type: string
+        default: ''
+      infix_repo:
+        required: false
+        type: string
+        default: kernelkit/infix
+      ninepm-conf:
+        required: false
+        type: string
+        default: ''
+      test-path:
+        required: false
+        type: string
+        default: 'test'
+
+env:
+  FLV: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.flavor || inputs.flavor }}
+  INFIX_REPO: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.infix_repo || inputs.infix_repo }}
+  NINEPM_CONF: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.ninepm-conf || inputs.ninepm-conf }}
+  TEST_PATH: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.test-path || inputs.test-path }}
+
+jobs:
+  test:
+    name: Regression Test ${{ inputs.name }} ${{ inputs.target }}
+    runs-on: [ self-hosted, regression ]
+    steps:
+      - name: Checkout infix repo
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ env.INFIX_REPO }}
+          ref: ${{ github.ref }}
+          clean: true
+          fetch-depth: 0
+          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
+
+          echo "flv=$FLV" >> $GITHUB_OUTPUT
+
+      - name: Configure ${{ inputs.target }}${{ steps.vars.outputs.flv }}
+        run: |
+          make ${{ inputs.target }}${{ 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: |
+          target=${{ inputs.target }}
+          name=${{ inputs.name }}
+
+          ls -l
+          mkdir -p output
+          mv ${name}-${target}.tar.gz output/
+          cd output/
+          tar xf ${name}-${target}.tar.gz
+          ln -s ${name}-${target} images
+
+      - name: Regression Test x86_64${{ steps.vars.outputs.flv }}
+        run: |
+          if [ -n "$NINEPM_CONF" ]; then
+            export NINEPM_PROJ_CONFIG="${GITHUB_WORKSPACE}/$NINEPM_CONF"
+            echo "DEBUG: NINEPM_PROJ_CONFIG is '$NINEPM_PROJ_CONFIG'"
+          fi
+          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_PATH/.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_PATH/9pm/report/theme.yml \
+          -a pdf-fontsdir=$TEST_PATH/9pm/report/fonts \
+          $TEST_PATH/.log/last/report.adoc \
+          -o $TEST_PATH/.log/last/report.pdf
+
+      - name: Upload Test Report as Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-report
+          path: ${{ env.TEST_PATH }}/.log/last/report.pdf
+
@@ -0,0 +1,37 @@
+name: Self Trigger
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, labeled]
+  push:
+    branches:
+      - main
+      - ci-workflow-redesign
+  workflow_dispatch:
+
+jobs:
+  build-x86_64:
+    uses: ./.github/workflows/build.yml
+    with:
+      target: "x86_64"
+      name: "infix"
+      flavor: "_minimal"
+
+  build-aarch64:
+    uses: ./.github/workflows/build.yml
+    with:
+      target: "aarch64"
+      name: "infix"
+      flavor: "_minimal"
+
+  test-run-x86_64:
+    needs: build-x86_64
+    uses: ./.github/workflows/test.yml
+    with:
+      target: "x86_64"
+      name: "infix"
+
+  test-publish-x86_64:
+    needs: test-run-x86_64
+    uses: ./.github/workflows/publish.yml
+
@@ -8,3 +8,4 @@
 /test/.venv
 /test/.log
 /local.mk
+/test/spec/Readme.adoc
@@ -65,7 +65,7 @@ config INFIX_COMPATIBLE

 config INFIX_TAGLINE
 	string "Operating system tagline"
-	default "Infix -- a Network Operating System"
+	default "Infix OS — Immutable.Friendly.Secure"
 	help
 	  Mandatory. Used for identifying the OS, e.g. as PRETTY_NAME in
 	  /etc/os-release and description in the GNS3 appliance.
@@ -2,11 +2,11 @@

 <img align="right" src="doc/logo.png" alt="Infix - Linux <3 NETCONF" width=480 border=10>

-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.
+Infix is a free, Linux-based, immutable operating system built around
+[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.

 > Click the **▶ Example CLI Session** foldout below for an example, or
 > head on over to the [Infix Documentation](doc/README.md) for more
@@ -27,13 +27,15 @@ 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
-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.
+In itself, Infix is perfectly suited for dedicated networking tasks,
+such as routing, switching, and monitoring.  This is how it started, as
+a network focused operating system.  Now, with native support for Docker
+containers, it 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,12 +95,14 @@ The [following boards](board/aarch64/README.md) are fully supported:
 - Marvell CN9130 CRB
 - Marvell EspressoBIN
 - Microchip SparX-5i PCB135 (eMMC)
- - StarFive VisionFive2
+ - Raspberry Pi 4B
 - NanoPi R2S

-An x86_64 build is also available, primarily intended for development
-and testing, but can also be used for evaluation and demo purposes.  For
-more information, see: [Infix in Virtual Environments](doc/virtual.md).
+Additionally, StarFive VisionFive2, a RISC-V based two-port router, and
+an x86_64 build is also available.  The latter is primarily intended for
+development and testing, but can also be used for evaluation and demo
+purposes.  For more information, see: [Infix in Virtual
+Environments](doc/virtual.md).

 > See the [GitHub Releases](https://github.com/kernelkit/infix/releases)
 > page for our pre-built images.  The *[Latest Build][]* has bleeding
@@ -106,6 +110,16 @@ more information, see: [Infix in Virtual Environments](doc/virtual.md).
 >
 > For *customer specific builds* of Infix, see your product repository.

+
+----
+
+<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,
    atomic updates, rollbacks, declarative configuration, and workload
    isolation.  All to improve reliability, scalability, and security.
@@ -128,5 +128,9 @@ 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
@@ -34,6 +34,10 @@ 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
@@ -57,6 +61,7 @@ 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
@@ -165,7 +170,6 @@ 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
@@ -227,6 +231,7 @@ 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
@@ -282,6 +287,7 @@ 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
@@ -353,13 +359,14 @@ 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_PLATFORM=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_SLAVE=y
 CONFIG_SPI=y
@@ -495,6 +502,7 @@ 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
@@ -523,13 +531,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
@@ -101,6 +101,13 @@ 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
 -----------

@@ -230,7 +230,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
@@ -481,7 +480,6 @@ CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_RK3X=y
 CONFIG_I2C_SLAVE=y
@@ -45,11 +45,11 @@ The default credentials for the demo builds is
    login: admin
    password: admin

-    Infix -- a Network Operating System v24.09.0-rc1 (hvc0)
+    Infix OS — Immutable.Friendly.Secure v24.09.0-rc1 (hvc0)
    infix-00-00-00 login: admin
    Password: 
    .-------.
-    |  . .  | Infix -- a Network Operating System
+    |  . .  | Infix OS — Immutable.Friendly.Secure
    |-. v .-| https://kernelkit.org
    '-'---'-'

@@ -122,9 +122,9 @@ There's a lot of tutorials and guides online, start here:
 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.
+Infix is a free, Linux-based, immutable operating system built around
+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
-# Tue Oct 22 13:12:02 2024
+# Sun Feb  9 12:25:37 2025
 #
 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 is not set
+CONFIG_PAM=y
 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 is not set
+CONFIG_FEATURE_SYNC_FANCY=y
 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 is not set
+CONFIG_TIMEOUT=y
 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 is not set
+CONFIG_FEATURE_WC_LARGE=y
 CONFIG_WHO=y
 CONFIG_W=y
 CONFIG_USERS=y
@@ -127,7 +127,7 @@ bootdata=
 diskimg=disk.img
 bootimg=
 bootpart=
-
+tmpimage=$(mktemp)
 while getopts "a:b:B:n:s:" opt; do
    case ${opt} in
 	a)
@@ -166,7 +166,7 @@ awk \
 	  -vimgsize=$imgsize \
 	  -vcfgsize=$cfgsize \
 	  -vvarsize=$varsize \
-	  -vdiskimg=$diskimg \
+	  -vdiskimg=$tmpimage \
 	  -vbootimg="$bootimg" -vbootpart="$bootpart" \
 	  '{
 		sub(/@TOTALSIZE@/, total);
@@ -211,5 +211,7 @@ genimage \
    --rootpath "$root" \
    --tmppath  "$tmp" \
    --inputpath "$BINARIES_DIR" \
-    --outputpath "$BINARIES_DIR" \
    --config "$root/genimage.cfg"
+
+qemu-img convert -c -O qcow2 "$tmpimage" "$BINARIES_DIR/$diskimg"
+rm "$tmpimage"
@@ -2,8 +2,6 @@

 set -e

-GIT_VERSION=$(git -C "$BR2_EXTERNAL_INFIX_PATH" describe --always --dirty --tags)
-
 name=$1
 compat=$2
 sign=$3
@@ -26,7 +24,7 @@ cp -f "$BINARIES_DIR/rootfs.itbh"     "$work/rootfs.itbh"
 cat >"$work/manifest.raucm" <<EOF
 [update]
 compatible=${compat}
-version=${GIT_VERSION}
+version=${INFIX_VERSION}

 [bundle]
 format=verity
@@ -39,22 +39,6 @@ if [ -n "${ID_LIKE}" ]; then
    ID="${ID} ${ID_LIKE}"
 fi

-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
-
-# Override VERSION in /etc/os-release and filenames for release builds
-if [ -n "$INFIX_RELEASE" ]; then
-    VERSION="$INFIX_RELEASE"
-else
-    VERSION=$GIT_VERSION
-fi
-
 if [ -n "$INFIX_IMAGE_ID" ]; then
    NAME="$INFIX_IMAGE_ID"
 else
@@ -71,12 +55,12 @@ rm -f "$TARGET_DIR/etc/os-release"
 {
    echo "NAME=\"$INFIX_NAME\""
    echo "ID=$INFIX_ID"
-    echo "PRETTY_NAME=\"$INFIX_TAGLINE $VERSION\""
+    echo "PRETTY_NAME=\"$INFIX_TAGLINE $INFIX_VERSION\""
    echo "ID_LIKE=\"${ID}\""
    echo "DEFAULT_HOSTNAME=$BR2_TARGET_GENERIC_HOSTNAME"
-    echo "VERSION=\"${VERSION}\""
-    echo "VERSION_ID=${VERSION}"
-    echo "BUILD_ID=\"${GIT_VERSION}\""
+    echo "VERSION=\"${INFIX_VERSION}\""
+    echo "VERSION_ID=${INFIX_VERSION}"
+    echo "BUILD_ID=\"${INFIX_BUILD_ID}\""
    if [ -n "$INFIX_IMAGE_ID" ]; then
 	echo "IMAGE_ID=\"$INFIX_IMAGE_ID\""
    fi
@@ -102,7 +86,7 @@ rm -f "$TARGET_DIR/etc/os-release"
    fi
 } > "$TARGET_DIR/etc/os-release"

-echo "$INFIX_TAGLINE $VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version"
+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"
@@ -130,6 +114,12 @@ grep -qsE '^/bin/true$$' "$TARGET_DIR/etc/shells" \
 grep -qsE '^/bin/false$$' "$TARGET_DIR/etc/shells" \
        || echo "/bin/false" >> "$TARGET_DIR/etc/shells"

+boards=$(${BR2_EXTERNAL_INFIX_PATH}/board/common/selected-boards.sh ${BR2_EXTERNAL_INFIX_PATH} ${O})
+
+for board in $boards; do
+	[ ! -f "${BR2_EXTERNAL_INFIX_PATH}/src/board/${board}/post-build.sh" ] && continue
+	${BR2_EXTERNAL_INFIX_PATH}/src/board/${board}/post-build.sh
+done
 # 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"
@@ -23,7 +23,7 @@ if [ -n "$IMAGE_ID" ]; then
 else
    NAME="$INFIX_ID"-$(echo "$BR2_ARCH" | tr _ - | sed 's/x86-64/x86_64/')
 fi
-diskimg=disk.img
+diskimg=disk.qcow2

 ver()
 {
@@ -48,7 +48,7 @@ fi
 load_cfg DISK_IMAGE
 if [ "$DISK_IMAGE" = "y" ]; then
    ixmsg "Creating Disk Image"
-    diskimg="${NAME}-disk$(ver).img"
+    diskimg="${NAME}-disk$(ver).qcow2"
    bootcfg=
    if [ "$DISK_IMAGE_BOOT_DATA" ]; then
 	bootcfg="-b $DISK_IMAGE_BOOT_DATA -B $DISK_IMAGE_BOOT_OFFSET"
@@ -90,7 +90,7 @@ if [ "$BR2_TARGET_ROOTFS_SQUASHFS" = "y" ]; then
    rel=$(ver)
    ln -sf rootfs.squashfs "$BINARIES_DIR/${NAME}${rel}.img"
    if [ -n "$rel" ]; then
-	ln -sf "$BINARIES_DIR/${NAME}${rel}.img" "$BINARIES_DIR/${NAME}.img"
+	ln -sf "${NAME}${rel}.img" "$BINARIES_DIR/${NAME}.img"
    fi
 fi

@@ -108,3 +108,11 @@ 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/"
+
+boards=$(${BR2_EXTERNAL_INFIX_PATH}/board/common/selected-boards.sh ${BR2_EXTERNAL_INFIX_PATH} ${O})
+for board in $boards; do
+	[ ! -f "${BR2_EXTERNAL_INFIX_PATH}/src/board/${board}/post-image.sh" ] && continue
+	RELEASE=$(ver)
+	export INFIX_ID RELEASE
+	${BR2_EXTERNAL_INFIX_PATH}/src/board/${board}/post-image.sh
+done
@@ -66,7 +66,7 @@ endchoice

 config QEMU_MACHINE
 	string "Select emulated machine"
-	default "qemu-system-aarch64 -M virt,accel=kvm:tcg -cpu max" if QEMU_aarch64
+	default "qemu-system-aarch64 -M virt,accel=kvm:tcg -cpu max,pauth-impdef=on" 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
@@ -78,7 +78,7 @@ config QEMU_MACHINE

 config QEMU_MACHINE_RAM
 	string "RAM size (k/M/G)"
-	default "384M"
+	default "448M"
 	help
 	  The default, 384 MiB, works for most configurations.  However,
 	  if you get kernel panic with: "System is deadlocked on memory",
@@ -189,7 +189,7 @@ config QEMU_CLOCK
 comment "Networking"

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

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

+config QEMU_NET_ROCKER
+     bool "Rocker"
+
 endchoice

 config QEMU_NET_MODEL
@@ -229,3 +232,8 @@ 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,9 +17,10 @@
 #
 #    ./qemu.sh -h
 #
+# shellcheck disable=SC3037

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

 usage()
@@ -30,6 +31,7 @@ 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"
@@ -54,19 +56,20 @@ die()

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

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

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

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

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

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

    if [ "$CONFIG_QEMU_ROOTFS_INITRD" = "y" ]; then
 	# Size of initrd, rounded up to nearest kb
-	local size=$((($(stat -c %s $CONFIG_QEMU_ROOTFS) + 1023) >> 10))
+	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 "
@@ -117,7 +120,7 @@ rootfs_args()
 	echo -n "-device sd-card,drive=mmc "
 	echo -n "-drive id=mmc,file=$CONFIG_QEMU_ROOTFS,if=none,format=raw "
    elif [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
-	echo -n "-drive file=$CONFIG_QEMU_ROOTFS.qcow2,if=virtio,format=qcow2,bus=0,unit=0 "
+	echo -n "-drive file=qemu.qcow2,if=virtio,format=qcow2,bus=0,unit=0 "
    fi
 }

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

 net_dev_args()
 {
-    local name="e$1"
-    local mac=$(printf "02:00:00:00:00:%02x" $1)
+    name="e$1"
+    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
@@ -216,14 +230,25 @@ 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
+	    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"
 	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
@@ -291,18 +316,17 @@ gdb_args()
 run_qemu()
 {
    if [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
-	if ! qemu-img check "${CONFIG_QEMU_ROOTFS}.qcow2"; then
-	    rm -f "${CONFIG_QEMU_ROOTFS}.qcow2"
+	if ! qemu-img check "qemu.qcow2"; then
+	    rm -f "qemu.qcow2"
 	fi
-	if [ ! -f "${CONFIG_QEMU_ROOTFS}.qcow2" ]; then
+	if [ ! -f "qemu.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
+		     -F qcow2 "qemu.qcow2" > /dev/null
 	fi
    fi

-    local qemu
-    read qemu <<EOF
+    read -r qemu <<EOF
 	$CONFIG_QEMU_MACHINE -nodefaults -m $CONFIG_QEMU_MACHINE_RAM \
 	  $(loader_args) \
 	  $(rootfs_args) \
@@ -317,18 +341,28 @@ run_qemu()
 	  $(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
-
-    if [ "$CONFIG_QEMU_KERNEL" ]; then
-	$qemu -append "$(append_args)" "$@"
-    else
-	$qemu "$@"
-    fi
-
+    $run
    stty "$line"
+    if [ -n "$keep" ]; then
+	echo "Keeping generated qemu.run script: $run"
+    else
+	rm "$run"
+    fi
 }

 dtb_args()
@@ -364,7 +398,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;"
@@ -404,7 +438,8 @@ menuconfig()
    exec kconfig-mconf Config.in
 }

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

 while [ "$1" != "" ]; do
    case $1 in
@@ -414,6 +449,9 @@ while [ "$1" != "" ]; do
 	-h)
 	    usage
 	    ;;
+	-k)
+	    keep=true
+	    ;;
 	*)
 	    break
    esac
@@ -9,46 +9,20 @@
 #   $3 IP adddress

 PATH="$PATH:/usr/bin:/usr/sbin:/bin:/sbin"
-NAME="/etc/frr/static.d/$2-zeroconf.conf"
-NEXT="${NAME}+"

 log()
 {
    logger -I $$ -t zeroconf -p user.notice "$*"
 }

-# Reduce changes needed by comparing with previous route(s)
-act()
-{
-    case $1 in
-	add)
-	    echo "! Generated by avahi-autoipd"  > "$NEXT"
-	    echo "ip route 0.0.0.0/0 $2 254"    >> "$NEXT"
-	    cmp -s "$NAME" "$NEXT" && return
-	    mv "$NEXT" "$NAME"
-	    ;;
-	del)
-	    [ -f "$NAME" ] || return
-	    rm "$NAME"
-	    ;;
-	*)
-	    return
-	    ;;
-    esac
-
-    initctl -nbq restart staticd
-}
-
 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
-	act add "$2"
 	log "set ipv4ll $3 on iface $2"
        ;;

    CONFLICT|UNBIND|STOP)
-	act del "$2"
        ip addr flush dev "$2" proto random
 	log "clr ipv4ll on iface $2"
        ;;
@@ -0,0 +1,2 @@
+# --log-level debug
+OSPFD_ARGS="-A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf --log syslog"
@@ -0,0 +1 @@
+RAUC_ARGS="-s"
@@ -0,0 +1,2 @@
+# --log-level debug
+ZEBRA_ARGS="-A 127.0.0.1 -u frr -g frr --log syslog "
@@ -3,16 +3,19 @@
 # and similar events feed servers and configuration to dnsmasq.
 domain-needed

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

+# 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
+
 # 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,4 +1,7 @@
-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> log kill:10 \
-	[2345] container -n %i -- container %i
+# 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
@@ -0,0 +1,9 @@
+# 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
@@ -0,0 +1,4 @@
+# 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 -p 8001 login -- Web terminal daemon (ttyd)
+service [2345] <!> ttyd -i lo -W -p 8001 login -- Web terminal daemon (ttyd)
@@ -0,0 +1,5 @@
+service name:wpa_supplicant :%i \
+			[2345] wpa_supplicant -s -i %i -c /etc/wpa_supplicant-%i.conf -P/var/run/wpa_supplicant-%i.pid \
+			       -- WPA supplicant @%i
+
+task name:wifi-scanner :%i [2345] <pid/wpa_supplicant:%i> /usr/libexec/infix/wifi-scanner %i -- Start scanning for SSID @ %i
@@ -0,0 +1 @@
+../available/mstpd.conf
@@ -0,0 +1 @@
+/var/lib/dbus/machine-id
@@ -1,4 +1,4 @@
 .-------.
-|  . .  | Infix -- a Network Operating System
+|  . .  | Infix OS — Immutable.Friendly.Secure
 |-. v .-| https://kernelkit.org
 '-'---'-'
@@ -1,2 +1 @@
 alias cli='clish'
-alias cfg='sysrepocfg -f json'
@@ -1,3 +0,0 @@
-HostKey /var/lib/ssh/ssh_host_rsa_key
-HostKey /var/lib/ssh/ssh_host_ecdsa_key
-HostKey /var/lib/ssh/ssh_host_ed25519_key
@@ -1,3 +0,0 @@
-net.ipv4.ip_forward=1
-net.ipv4.ip_forward_update_priority=0
-net.ipv6.conf.all.forwarding=1
@@ -1 +1,32 @@
+# 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,5 +1,23 @@
-net.ipv6.conf.all.forwarding=1
+# 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.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
@@ -0,0 +1,145 @@
+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
@@ -0,0 +1 @@
+SUBSYSTEM=="net", ACTION=="add", TEST=="/sys/class/net/$name/wireless", NAME="wifi%n"
@@ -0,0 +1,165 @@
+# /etc/watchdogd.conf sample
+# Commented out values are program defaults.
+#
+# The checker/monitor `warning` and `critical` levels are 0.00-1.00,
+# i.e. 0-100%, except for load average which can vary a lot between
+# systems and use-cases, not just because of the number of CPU cores.
+# Use the `script = ...` setting to call script when `warning` and
+# `critical` are reached for a monitor.  In `critical` the monitor
+# otherwise triggers an unconditional reboot.
+#
+# NOTE: `critical` is optional, omitting it disables the reboot action.
+#
+
+### Watchdogs ##########################################################
+# Global settings that can be overridden per watchdog
+
+# Do not set WDT timeout and kick interval too low, the daemon runs at
+# SCHED_OTHER level with all other tasks, unless the process supervisor
+# is enabled.  The monitor plugins (below) need CPU time as well.
+#timeout   = 20
+#interval  = 10
+
+# With safe-exit enabled (true) the daemon will ask the driver disable
+# the WDT before exiting (SIGINT).  However, some WDT drivers (or HW)
+# may not support this.
+#safe-exit = true
+
+# Multiple watchdogs can be kicked, the default, even if no .conf file
+# is found or device node given on the command line, is /dev/watchdog
+device /dev/watchdog {
+    timeout    = 60
+    interval   = 5
+    safe-exit  = true
+}
+
+#device /dev/watchdog2 {
+#    timeout    = 20
+#    interval   = 10
+#    safe-exit  = true
+#}
+
+### Supervisor #########################################################
+# Instrumented processes can have their main loop supervised.  Processes
+# subscribe to this service using the libwdog API, see the docs for more
+# on this.  When the supervisor is enabled and the priority is set to a
+# value > 0, watchdogd runs as a SCHED_RR process with elevated realtime
+# priority.  When disabled, or the priority is set to zero (0), it runs
+# as a regular SCHED_OTHER process, this is the default.
+#
+# When a supervised process fails to meet its deadline, the daemon will
+# perform an unconditional reset having saved the reset reason.  If a
+# script is provided in this section it will be called instead.  The
+# script is called as:
+#
+#    script.sh supervisor CODE PID LABEL
+#
+# Availabel CODEs for the reset reason are avilable in wdog.h
+#
+#supervisor {
+#    !!!REMEMBER TO ENABLE reset-reason (below) AS WELL!!!
+#    enabled  = true
+#    priority = 98
+#    script = "/path/to/supervisor-script.sh"
+#}
+
+### Reset reason #######################################################
+# The following section controls if/how the reset reason & reset counter
+# is tracked.  By default this is disabled, since not all systems allow
+# writing to disk, e.g. embedded systems using MTD devices with limited
+# number of write cycles.
+#
+# The default file setting is a non-volatile path, according to the FHS.
+# It can be changed to another location, but make sure that location is
+# writable first.
+reset-reason {
+    enabled = true
+    file    = "/var/lib/misc/watchdogd.state"
+}
+
+### Checkers/Monitors ##################################################
+#
+# Script or command to run instead of reboot when a monitor plugin
+# reaches any of its critical or warning level.  Setting this will
+# disable the built-in reboot on critical, it is therefore up to the
+# script to perform reboot, if needed.  The script is called as:
+#
+#    script.sh {filenr, fsmon, loadavg, meminfo} {crit, warn} VALUE
+#
+#script = "/path/to/reboot-action.sh"
+
+# Monitors file descriptor leaks based on /proc/sys/fs/file-nr
+filenr {
+#    enabled = true
+    interval = 300
+    logmark  = false
+    warning  = 0.9
+    critical = 1.0
+#    script = "/path/to/alt-reboot-action.sh"
+}
+
+# Monitors a file system, blocks and inode usage against watermarks
+# The script is called with fsmon as the first argument and there
+# are two environment variables FSMON_NAME, for the monitored path,
+# and FSMON_TYPE indicating either 'blocks' or 'inodes'.
+#fsmon /var {
+#    enabled = true
+#    interval = 300
+#    logmark  = false
+#    warning  = 0.95
+#    critical = 1.0
+#    script = "/path/to/alt-reboot-action.sh"
+#}
+
+# Monitors load average based on sysinfo() from /proc/loadavg
+# The level is composed from the average of the 1 and 5 min marks.
+loadavg {
+#    enabled = true
+    interval = 300
+    logmark  = false
+    warning  = 1.0
+    critical = 2.0
+#    script = "/path/to/alt-reboot-action.sh"
+}
+
+# Monitors free RAM based on data from /proc/meminfo
+meminfo {
+#    enabled = true
+    interval = 300
+    logmark  = false
+    warning  = 0.9
+    critical = 0.95
+#    script = "/path/to/alt-reboot-action.sh"
+}
+
+# Monitor temperature.  The critical value is unset by default, so no
+# action is taken at that watermark (by default).  Both the critical and
+# warning watermarks are relative to the trip/critical/max value from
+# sysfs.  The warning is default 0.9, i.e., 90% of critical.  Use script
+# to to reset the fan controller or poweroff(8) the system.
+#
+# Each temp monitor caches the last 10 values, calculates the mean, and
+# compares that to the warning and critical levels.  Logging is only
+# done every 10 x interval (if enabled).
+#tempmon /sys/class/hwmon/hwmon0/temp1_input {
+#    enabled  = true
+#    interval = 30
+#    warning  = 0.9
+#    critical = 0.95
+#    logmark  = true
+#    script   = "/script/to/log/and/poweroff.sh"
+#}
+
+# Monitor a generic script, executes 'monitor-script' every 'interval'
+# seconds, with a max runtime of 'timeout' seconds.  When the exit code
+# of the monitor script is above the critical level watchdogd either
+# starts the reboot, or calls the alternate 'script' to determin the
+# next cause of action.
+#generic /path/to/monitor-script.sh {
+#    enabled = true
+#    interval = 300
+#    timeout = 60
+#    warning  = 1
+#    critical = 10
+#    script = "/path/to/alt-reboot-action.sh"
+#}
@@ -0,0 +1,58 @@
+#!/bin/sh
+# User-friendly wrapper for sysrepocfg
+# TODO: add import/export, copy, ...
+
+# Edit YANG binary types using sysrepo, base64, and duct tape.
+edit()
+{
+    xpath=$1
+    if [ -z "$xpath" ]; then
+	echo "Usage: cfg edit \"/full/xpath/to/binary/leaf\""
+	exit 1
+    fi
+
+    if tmp=$(sysrepocfg -G "$xpath"); then
+	file=$(mktemp)
+
+	echo "$tmp" | base64 -d > "$file"
+	if /usr/bin/editor "$file"; then
+	    tmp=$(base64 -w0 < "$file")
+	    sysrepocfg -S "$xpath" -u "$tmp"
+	fi
+
+	rm -f "$file"
+    else
+	echo "Failed to retrieve value for $xpath"
+	exit 1
+    fi
+}
+
+usage()
+{
+    echo "Usage:"
+    echo "    cfg CMD [ARG]"
+    echo
+    echo "Command:"
+    echo "    edit XPATH   Edit YANG binary type"
+    echo "    help         This help text"
+    echo
+    echo "As a backwards compatible fallback, this script forwards"
+    echo "all other commands as options to sysrepocfg."
+    echo
+
+    exit 0
+}
+
+cmd=$1; shift
+case $cmd in
+    edit)
+	edit "$1"
+	;;
+    help)
+	usage
+	;;
+    *)
+	set -- "$cmd" "$@"
+	exec sysrepocfg -f json "$@"
+	;;
+esac
@@ -21,7 +21,11 @@ dir()
 if [ -d "$1" ]; then
    dir "$1"
 else
-    dir "$HOME"
+    if [ "$USER" = "root" ]; then
+	dir "$HOME"
+    else
+	dir "/home/$USER"
+    fi
    dir "/cfg"
    dir "/log"
 fi
@@ -1 +0,0 @@
-less
@@ -0,0 +1,14 @@
+#!/bin/sh
+# -d ;; suppress error message "the terminal is dumb"
+# -F :: exit if the entire file can be displayed on the first screen
+# -I :: Ignore case, even for patterns
+# -K :: exit immediately when an interrupt character (usually ^C) is typed
+# -R :: Almost raw control charachters, only ANSI color escape sequences and
+#       OSC 8 hyperlink sequences are output.  Allows veritcal scrolling
+# -X :: No termcap initialization and deinitialization set to the terminal.
+#       This is what leaves the contents of the output on screen.
+
+export LESS="-P %f (press h for help or q to quit)"
+export LANG=en_US.UTF-8
+
+less -RIKd -FX "$@"
@@ -70,12 +70,14 @@ options:
  -p            Show plain output, no bells or whistles

 commands:
+  dhcp          Show DHCP server
  port PORT     Show port configuration and link information
  ports         Show ports available for bridging
  vlans         Show port groups in bridge
  ifaces        Show interfaces and their addresses
  fdb           Show forwarding database (unicast)
  mdb           Show multicast forwarding database
+  stp           Show spanning tree status
  ip   addr     Show IPv4 addresses
       route    Show routing table
  ipv6 addr     Show IPv6 addresses
@@ -87,6 +89,41 @@ commands:
 EOF
 }

+is_dhcp_running()
+{
+    sysrepocfg -X -f json -m infix-dhcp-server | jq -r '
+        ."infix-dhcp-server:dhcp-server".enabled as $global |
+        if ."infix-dhcp-server:dhcp-server".subnet? then
+                (."infix-dhcp-server:dhcp-server".subnet[] |
+                select(.enabled != false)) |
+                if $global != false and . then "true" else "false" end
+        else "false" end
+    ' 2>/dev/null | grep -q true
+}
+
+dhcp()
+{
+    if ! is_dhcp_running; then
+	echo "DHCP server not enabled."
+	exit 0
+    fi
+
+    case $1 in
+	detail)
+	    sysrepocfg -f json -X -d operational -m infix-dhcp-server | \
+		jq -C .
+	    ;;
+	stat*)
+	    sysrepocfg -f json -X -d operational -m infix-dhcp-server | \
+		/usr/libexec/statd/cli-pretty "show-dhcp-server" -s
+	    ;;
+	*)
+	    sysrepocfg -f json -X -d operational -m infix-dhcp-server | \
+		/usr/libexec/statd/cli-pretty "show-dhcp-server"
+	    ;;
+    esac
+}
+
 # Usage 1: show port eth0
 # Usage 2: show port
 # Usage 3: show ports
@@ -188,6 +225,12 @@ rstp()
    mstpctl showport br0
 }

+stp()
+{
+    sysrepocfg -f json -X -d operational -m ietf-interfaces | \
+        /usr/libexec/statd/cli-pretty "show-bridge-stp"
+}
+
 fdb()
 {
    bridge $bopt fdb show
@@ -288,6 +331,9 @@ case $cmd in
    help)
 	usage
 	;;
+    dhcp | dhcp-server)
+	dhcp $*
+	;;
    port*)
 	ports $*
 	;;
@@ -353,6 +399,9 @@ case $cmd in
    span*)
 	rstp
 	;;
+    stp*)
+	stp
+	;;
    sys*)
 	system
 	;;
@@ -0,0 +1,9 @@
+# Extend finit's default udevadm settle synchronization for situations
+# where device are very slow to probe (see #685)
+run nowarn if:udevd cgroup.init <service/udevd/ready> log \
+	[S] /usr/libexec/infix/hw-wait -- Probing hardware
+
+# Now that everything should be probed, do a final pass over the
+# uevent queue before starting syslogd and everything else
+run nowarn if:udevd cgroup.init :post <service/udevd/ready> log \
+	[S] udevadm settle -t 30 --
@@ -0,0 +1,6 @@
+d  /run/containers/args		0700 - -
+d  /run/containers/files	0700 - -
+d  /var/lib/containers		0700 - -
+d  /var/lib/containers/oci	0700 - -
+d  /run/cni			0755 - -
+L+ /var/lib/cni                 -    - - - /run/cni
@@ -1 +1,2 @@
 d /var/run/frr 0755 frr frr -
+R /var/tmp/frr -    -   -   -
@@ -0,0 +1,12 @@
+#!/bin/sh
+if [ $# -lt 2 ]; then
+        echo "usage: $0 <quirk-name> <ifname>"
+        exit 1
+fi
+quirk=$1
+ifname=$2
+if [ -f "/etc/product/interface-quirks.json" ]; then
+        echo "$(jq -r --arg iface "$ifname" --arg quirk "$quirk" '.[$iface][$quirk] // "false"' /etc/product/interface-quirks.json)"
+else
+        echo "false"
+fi
@@ -0,0 +1,41 @@
+#!/bin/sh
+# (Ab)use the kernel's device link subsystem to detect consumer side
+# devices that may be very slow to probe (looking at you, mv88e6xxx!).
+
+ident=$(basename "$0")
+
+report()
+{
+    if [ -r "/tmp/$ident" ]; then
+	logger -k -p "user.$1" -t "$ident" "Waited for slow devices:"
+	sort "/tmp/$ident" | uniq -c | logger -k -p "user.$1" -t "$ident"
+    fi
+
+    rm -f "/tmp/$ident"
+}
+
+for _ in $(seq 50); do
+    again=
+
+    for dl in /sys/class/devlink/*; do
+    	[ -r "$dl/status" ] || continue
+
+    	status=$(cat "$dl/status")
+	if [ "$status" = "consumer probing" ]; then
+	    basename "$(readlink "$dl/consumer")" >>"/tmp/$ident"
+	    again=yes
+	fi
+
+    done
+
+    if [ -z "$again" ]; then
+	report notice
+	exit 0
+    fi
+
+    sleep .2
+done
+
+logger -k -p user.error -t "$ident" "Timeout waiting for devices to come online"
+report error
+exit 1
@@ -8,10 +8,11 @@ import struct
 import subprocess
 import sys

-onieprom = importlib.machinery.SourceFileLoader("onieprom","/bin/onieprom").load_module()
-SYSTEM_JSON   = "/run/system.json"
+onieprom = importlib.machinery.SourceFileLoader("onieprom", "/bin/onieprom").load_module()
+SYSTEM_JSON = "/run/system.json"
 KKIT_IANA_PEM = 61046

+
 class DTSystem:
    BASE = "/sys/firmware/devicetree/base"
    INFIX = BASE + "/chosen/infix"
@@ -28,7 +29,9 @@ class DTSystem:
            if not os.path.exists(phandle):
                continue

-            ph, = struct.unpack(">L", open(phandle, "rb").read())
+            with open(phandle, "rb") as f:
+                data = f.read()
+            ph, = struct.unpack(">L", data)
            dt[ph] = root

        sys = {}
@@ -40,14 +43,18 @@ class DTSystem:
            if not os.path.exists(phandle):
                continue

-            ph, = struct.unpack(">L", open(phandle, "rb").read())
+            with open(phandle, "rb") as f:
+                data = f.read()
+            ph, = struct.unpack(">L", data)
            if ph not in sys:
                sys[ph] = []
            sys[ph].append(root)

        phs = set(list(dt.keys()) + list(sys.keys()))

-        self.devs = { ph: [Device(ph, dt.get(ph), s if s is not None else "") for s in (sys.get(ph) or []) if ph is not None]  for ph in phs }
+        self.devs = {ph: [Device(ph, dt.get(ph), s if s is not None else "")
+                          for s in (sys.get(ph) or []) if ph is not None]
+                     for ph in phs}
        self.base = Device(0, None, DTSystem.BASE)
        self.infix = Device(0, None, DTSystem.INFIX)

@@ -56,7 +63,8 @@ class DTSystem:
        if not os.path.exists(path):
            return ()

-        data = open(path, "rb").read()
+        with open(path, "rb") as f:
+            data = f.read()
        elems = len(data) // struct.calcsize(">L")
        return struct.unpack(">" + elems * "L", data)

@@ -69,7 +77,8 @@ class DTSystem:
                return {}

            try:
-                data = onieprom.from_tlv(open(dev.attrpath("nvmem"), "rb", 0))
+                with open(dev.attrpath("nvmem"), "rb", 0) as f:
+                    data = onieprom.from_tlv(f)
            except:
                data = {}

@@ -84,14 +93,18 @@ class DTSystem:
        }

    def infix_usb_devices(self, out):
-        names=self.infix.str_array("usb-port-names", ())
-        phs=self.__get_phandle_array("usb-ports")
-        data=dict(zip(names,phs))
+        names = self.infix.str_array("usb-port-names", ())
+        phs = self.__get_phandle_array("usb-ports")
+        data = dict(zip(names, phs))
        if data != {}:
            out["usb-ports"] = []
-        for name,ph in data.items():
-            [out["usb-ports"].extend([{"name": name, "path": dev.attrpath("authorized")}, {"name": name, "path": dev.attrpath("authorized_default")}]) for dev in self.devices_from_ph(ph)]
-
+        for name, ph in data.items():
+            [out["usb-ports"].extend([{
+                "name": name,
+                "path": dev.attrpath("authorized")}, {
+                    "name": name,
+                    "path": dev.attrpath("authorized_default")
+                }]) for dev in self.devices_from_ph(ph)]

    def infix_devices(self, kind):
        phs = self.__get_phandle_array(kind)
@@ -101,6 +114,7 @@ class DTSystem:
        flat_devices = [device for sublist in self.infix_devices("vpds") for device in sublist]
        return [self.into_vpd(device) for device in flat_devices]

+
 class QEMUSystem:
    BASE = "/sys/firmware/qemu_fw_cfg"
    REV = BASE + "/rev"
@@ -110,7 +124,8 @@ class QEMUSystem:
        data = {}
        if os.path.exists(QEMUSystem.VPD):
            try:
-                data = onieprom.from_tlv(open(QEMUSystem.VPD, "rb", 0))
+                with open(QEMUSystem.VPD, "rb", 0) as f:
+                    data = onieprom.from_tlv(f)
            except:
                pass

@@ -127,31 +142,27 @@ class QEMUSystem:
    def usb_ports(self):
        ports = [
            {
-            "name": "USB",
-            "path": "/sys/bus/usb/devices/usb1/authorized"
-
-        },
-        {
-            "name": "USB",
-            "path": "/sys/bus/usb/devices/usb1/authorized_default"
-
-        },
-        {
-            "name": "USB2",
-            "path": "/sys/bus/usb/devices/usb2/authorized"
-        },
-        {
-            "name": "USB2",
-            "path": "/sys/bus/usb/devices/usb2/authorized_default"
-
-        }]
+                "name": "USB",
+                "path": "/sys/bus/usb/devices/usb1/authorized"
+            }, {
+                "name": "USB",
+                "path": "/sys/bus/usb/devices/usb1/authorized_default"
+            }, {
+                "name": "USB2",
+                "path": "/sys/bus/usb/devices/usb2/authorized"
+            }, {
+                "name": "USB2",
+                "path": "/sys/bus/usb/devices/usb2/authorized_default"
+            }]
        return ports
+
+
 class Device:
    def __init__(self, ph, dtpath, syspath):
        self.ph, self.dtpath, self.syspath = ph, dtpath, syspath

    def available(self):
-        return self.syspath != None
+        return self.syspath is not None

    def __getitem__(self, attr):
        return self.attr(attr).decode("utf-8").strip("\0")
@@ -159,7 +170,6 @@ class Device:
    def __setitem__(self, attr, value):
        return self.attr(attr, val=value.encode("utf-8"))

-
    def attrpath(self, attr):
        return os.path.join(self.syspath, attr)

@@ -168,13 +178,16 @@ class Device:

    def attr(self, attr, default=None, val=None):
        if not self.hasattr(attr):
-            return default if val == None else False
+            return default if val is None else False

        if val:
-            open(self.attrpath(attr), "wb").write(value)
+            with open(self.attrpath(attr), "wb") as f:
+                f.write(val)
            return True

-        return open(self.attrpath(attr), "rb").read()
+        with open(self.attrpath(attr), "rb") as f:
+            data = f.read()
+        return data

    def str(self, attr, default=None):
        val = self.attr(attr)
@@ -194,7 +207,9 @@ class Device:
        if not self.hasdtattr(attr):
            return default

-        return open(self.dtattrpath(attr), "rb").read()
+        with open(self.dtattrpath(attr), "rb") as f:
+            data = f.read()
+        return data

    def dtstr(self, attr, default=None):
        val = self.dtattr(attr)
@@ -212,6 +227,7 @@ def vpd_get_json_ve(vpd, pem):

    return out

+
 def vpd_get_pwhash(vpd):
    if not vpd.get("trusted"):
        return None
@@ -219,8 +235,9 @@ def vpd_get_pwhash(vpd):
    kkit = vpd_get_json_ve(vpd, KKIT_IANA_PEM)
    return kkit.get("pwhash")

+
 def vpd_inject(out, vpds):
-    out["vpd"] = { vpd["board"]: vpd for vpd in vpds }
+    out["vpd"] = {vpd["board"]: vpd for vpd in vpds}

    product = out["vpd"].get("product", {}).get("data", {})
    hoistattrs = ("vendor", "product-name", "part-number", "serial-number", "mac-address")
@@ -234,6 +251,7 @@ def vpd_inject(out, vpds):
            out["factory-password-hash"] = pwhash
            break

+
 def qemu_base_mac():
    """Find MAC address of first non-loopback interface, subtract with 1"""
    base_path = '/sys/class/net'
@@ -244,7 +262,8 @@ def qemu_base_mac():
            continue
        try:
            # pylint: disable=invalid-name
-            with open(os.path.join(base_path, iface, 'address'), 'r', encoding='ascii') as f:
+            fn = os.path.join(base_path, iface, 'address')
+            with open(fn, 'r', encoding='ascii') as f:
                mac = f.read().strip()
            interfaces.append((mac, iface))
        except FileNotFoundError:
@@ -261,6 +280,7 @@ def qemu_base_mac():

    return None

+
 def probe_qemusystem(out):
    """Probe Qemu based test systems and 'make run'"""
    admin_hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A"
@@ -288,15 +308,54 @@ def probe_qemusystem(out):
    subprocess.run("initctl -nbq cond set qemu".split(), check=False)
    return 0

+def rasberry_pi_4_usb_ports(out):
+    out["usb-ports"] = [
+        {
+            "name": "USB",
+            "path": "/sys/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/authorized"
+        },
+        {
+            "name": "USB",
+            "path": "/sys/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/authorized_default"
+        },
+        {
+            "name": "USB",
+            "path": "/sys/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-1/authorized",
+        },
+        {
+            "name": "USB",
+            "path": "/sys/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-0:1.0/authorized"
+        },
+        {
+            "name": "USB",
+            "path": "/sys/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/authorized"
+        },
+        {
+            "name": "USB",
+            "path": "/sys/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/authorized_default"
+        },
+        {
+            "name": "USB3",
+            "path": "/sys/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-0:1.0/authorized"
+        }
+    ]
+
 def probe_dtsystem(out):
    """Probe DTS based system, expects a VPD in ONIE PROM format."""
    dtsys = DTSystem()
    vpds = dtsys.infix_vpds()
-    dtsys.infix_usb_devices(out)
+
    model = dtsys.base.str("model")
    if model:
        out["product-name"] = model

+    # Since rpi4 has USB on PCIe, there is no phandle reference
+    if model and model.startswith("Raspberry Pi 4"):
+        rasberry_pi_4_usb_ports(out)
+    else:
+        dtsys.infix_usb_devices(out)
+    out["compatible"] = dtsys.base.str_array("compatible")
+
    staticpw = dtsys.infix.str("factory-password-hash")
    if not out["factory-password-hash"]:
        out["factory-password-hash"] = staticpw
@@ -304,6 +363,7 @@ def probe_dtsystem(out):
    vpd_inject(out, vpds)
    return 0

+
 def main():
    out = {
        "vendor": None,
@@ -338,5 +398,6 @@ def main():
    shutil.chown(SYSTEM_JSON, user="root", group="wheel")
    return err

+
 if __name__ == "__main__":
    sys.exit(main())
@@ -1,22 +1,50 @@
 #!/bin/sh
-# Find and install any product specific files in /etc before bootstrap
+# Find, install, and run product specific files and script in /etc
+# before resuming bootstrap.
+#
+# Use /etc/product/init.d/S01-myscript for scripts, may be a symlink, it
+# will be called with `start` as its only argument.
+#
+# The compatible array is listed in the same order as the device tree,
+# most significant to least.  Hence the reverse.[], to ensure overrides
+# are applied in order of significance.
 ident=$(basename "$0")

+PRODUCT_INIT=/etc/product/init.d
 PREFIXD=/usr/share/product
-PRODUCT=$(jq -r '."product-name" | ascii_downcase' /run/system.json)
+COMPATIBLES=$(jq -r '.compatible | reverse.[] | ascii_downcase' /run/system.json)

 note()
 {
    logger -I $$ -k -p user.notice -t "$ident" "$1"
 }

-DIR="$PREFIXD/$PRODUCT"
-if [ -z "$PRODUCT" ] || [ ! -d "$DIR" ]; then
-    note "No vendor/product specific directory found, using built-in defaults."
-    exit 0
+found=false
+for PRODUCT in $COMPATIBLES; do
+    DIR="$PREFIXD/$PRODUCT"
+    if [ -d "$DIR" ]; then
+        note "Using vendor/product-specific defaults for $PRODUCT."
+        for dir in "$DIR"/*; do
+            [ -d "$dir" ] && cp -a "$dir" /
+        done
+        found=true
+    fi
+done
+
+if [ "$found" = false ]; then
+    note "No vendor/product-specific directory found, using built-in defaults."
 fi

-note "Using vendor/product specific defaults."
-for dir in "$DIR"/*; do
-    [ -d "$dir" ] && cp -a "$dir" /
-done
+# Conditions for bootstrap services, this enables product specific
+# init scripts to prevent select services from starting.
+initctl -nbq cond set led
+
+if [ -d "$PRODUCT_INIT" ]; then
+    note "Calling runparts $PRODUCT_INIT/S[0-9]+.* start"
+    /usr/libexec/finit/runparts -bsp "$PRODUCT_INIT"
+fi
+
+# Product specific init done.
+initctl -nbq cond set product
+
+exit 0
@@ -14,24 +14,6 @@ for file in /sys/firmware/qemu_fw_cfg/by_name/opt/mactab/raw /etc/mactab; do
 	fi
 done

-# Sometimes the sysfs is not populated when the switch driver is loaded, with the result
-# that the DSA interface was not found (no /dsa/tagging entry in sysfs. See issue #685.
-#
-# This mitigates that problem by waiting for sysfs to come up if a DSA switch is found
-if [ -n "$(devlink -j dev info | jq -r '.info.[].driver' | grep -q mv88e6085)" ]; then
-	timeout=50
-	while [ -z "$(ls /sys/class/net/*/dsa/tagging)" ]; do
-		timeout=$((timeout-1))
-		if [ $timeout -eq 0 ]; then
-			logger -k -p user.emerg -t "$ident" "Failed to find DSA interface"
-			exit 1
-		fi
-		sleep 0.1
-	done
-
-	logger -k -p user.notice -t "$ident" "Found DSA interface in $timeout seconds"
-fi
-
 # Find CPU interfaces used for connecting to a switch managed by DSA
 for netif in /sys/class/net/*; do
 	iface=$(basename "$netif")
@@ -43,10 +43,15 @@ while [ "$1" ]; do
    txqs="$2"
    shift 2

+    [ $(/usr/libexec/infix/has-quirk "broken-mqprio" "$iface") = "true" ] && echo "Skipping $iface, does not support mqprio" && continue
    [ $txqs -lt 2 ] && continue
    [ $txqs -gt 8 ] && txqs=8

-    tc qdisc add dev $iface root mqprio hw 1 \
-       num_tc $txqs $(map $txqs) $(queues $txqs) || true
+    output=$(tc qdisc add dev $iface root mqprio hw 1 \
+		num_tc $txqs $(map $txqs) $(queues $txqs) 2>&1) || true
+    if echo "$output" | grep -q "does not support hardware offload"; then
+        echo "Skipping $iface, hardware offload not supported."
+    elif [ -n "$output" ]; then
+	echo "$output"
+    fi
 done
-
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Initialize speed/duplex of virtio interfaces
+# For virtual test systems (lacp tests)
+
+ifaces=$(ip -d -json link show | jq -r '.[] | select(.parentbus == "virtio") | .ifname')
+for iface in $ifaces; do
+    ethtool -s "$iface" speed 1000 duplex full
+done
@@ -4,10 +4,14 @@
 # the migrate tool inserts old version in name before .cfg extension.
 CONFIG_FILE="/cfg/startup-config.cfg"
 BACKUP_FILE="/cfg/backup/startup-config.cfg"
-mkdir -p "$(dirname "$BACKUP_FILE")"
+BACKUP_DIR="$(dirname "$BACKUP_FILE")"
+
+mkdir -p         "$BACKUP_DIR"
+chown root:wheel "$BACKUP_DIR"
+chmod 0770       "$BACKUP_DIR"

 if [ ! -f "$CONFIG_FILE" ]; then
-    note "No $(basename "$CONFIG_FILE" .cfg) yet, likely factory reset."
+    logger -I $$ -k -p user.notice -t $(basename "$0")  "No $(basename "$CONFIG_FILE" .cfg) yet, likely factory reset."
    exit 0
 elif migrate -cq "$CONFIG_FILE"; then
    exit 0
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec initctl -bq cond set ixinit-done
+exec initctl -bq cond set ixinit
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Store and convert RSA PUBLIC/PRIVATE KEYs to be able to use them in
+# OpenSSHd.
+set -e
+
+NAME="$1"
+DIR="$2"
+PUBLIC="$3"
+PRIVATE="$4"
+TMP="$(mktemp)"
+
+echo -e '-----BEGIN RSA PRIVATE KEY-----' > "$DIR/$NAME"
+echo "$PRIVATE" >> "$DIR/$NAME"
+echo -e '-----END RSA PRIVATE KEY-----' >> "$DIR/$NAME"
+
+echo -e "-----BEGIN RSA PUBLIC KEY-----" > "$TMP"
+echo -e "$PUBLIC" >> "$TMP"
+echo -e "-----END RSA PUBLIC KEY-----" >> "$TMP"
+
+ssh-keygen -i -m PKCS8 -f "$TMP" > "$DIR/$NAME.pub"
+chmod 0600 "$DIR/$NAME.pub"
+chmod 0600 "$DIR/$NAME"
+chown sshd:sshd "$DIR/$NAME.pub"
+chown sshd:sshd "$DIR/$NAME"
@@ -45,11 +45,6 @@ factory_reset()
    find /sys/class/leds/ -type l -exec sh -c 'echo 100 > $0/brightness' {} \;
    logger $opt -p user.crit -t "$nm" "Resetting to factory defaults."

-    # Shred all files to prevent restoring contents
-    find /mnt/cfg -type f -exec shred -zu {} \;
-    find /mnt/var -type f -exec shred -zu {} \;
-
-    # Remove any lingering directories and symlinks as well
    rm -rf /mnt/cfg/* /mnt/var/*

    logger $opt -p user.crit -t "$nm" "Factory reset complete."
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ $# -ne 1 ]; then
+	echo "usage: $0 <ifname>"
+	exit 1
+fi
+ifname=$1
+
+TIMEOUT=300
+status=$(wpa_cli -i $ifname scan)
+while [ "$status" != "OK" ]; do
+	status=$(wpa_cli -i $ifname scan)
+	TIMEOUT=$((TIMEOUT-1))
+	[ $TIMEOUT -eq 0 ] && logger -t wifi-scanner "Failed to start scanning $ifname" && exit 1
+	sleep 0.5
+done
@@ -1,5 +1,19 @@
-#!/bin/sh
-
+#!/bin/bash
+# This script can be used to start, stop, create, and delete containers.
+# It is what confd use, with the Finit container@.conf template, to set
+# up, run, and delete containers.
+#
+# NOTE: when creating/deleting containers, remember 'initctl reload' to
+#       activate the changes!  In confd this is already handled.
+#
+DOWNLOADS=/var/lib/containers/oci
+BUILTIN=/lib/oci
+TMPDIR=/var/tmp
+container=$0
+checksum=""
+extracted=
+timeout=30
+dir=""
 all=""
 env=""
 port=""
@@ -10,80 +24,192 @@ log()
    logger -I $PPID -t container -p local1.notice -- "$*"
 }

+err()
+{
+    rc=$1; shift
+    logger -I $PPID -t container -p local1.err -- "Error: $*"
+
+    if [ -n "$extracted" ]; then
+	if [ -d "$TMPDIR/$dir" ]; then
+	    log "Cleaning up extracted $dir"
+	    rm -rf "$dir"
+	fi
+    fi
+
+    [ "$rc" -eq 0 ] || exit "$rc"
+}
+
+pidfn()
+{
+    echo "/run/containers/${1}.pid"
+}
+
+check()
+{
+    file=$1
+
+    if [ -z "$checksum" ]; then
+	log "no checksum to verify $file against, continuing."
+	return 0
+    fi
+
+    if echo "${checksum}  ${file}" | "$cmdsum" -c -s; then
+        log "$file checksum verified OK."
+	return 0
+    fi
+
+    got=$("$cmdsum" "${file}" | awk '{print $1}')
+    log "$file checksum mismatch, got $got, expected $checksum, removing file."
+    rm -f "$file"
+
+    return 1
+}
+
+# Fetch an OCI image over ftp/http/https.  Use wget for FTP, which curl
+# empirically does not work well with.  Log progress+ & error to syslog.
+fetch()
+{
+    url=$1
+    file=$(basename "$url")
+    dst="$DOWNLOADS/$file"
+
+    cd "$DOWNLOADS" || return
+    if [ -e "$file" ]; then
+	log "$file already available."
+	if check "$file"; then
+	    echo "$dst"
+	    return 0
+	fi
+    fi
+
+    log "Fetching $url"
+
+    if echo "$url" | grep -qE "^ftp://"; then
+        cmd="wget -q $url"
+    elif echo "$url" | grep -qE "^https?://"; then
+        cmd="curl $creds -sSL --fail -o \"$file\" $url"
+    else
+        log "Unsupported URL scheme: $url"
+        return 1
+    fi
+
+    if out=$(eval "$cmd" 2>&1); then
+	log "$file downloaded successfully."
+	if check "$file"; then
+	    echo "$dst"
+	    return 0
+	fi
+    fi
+
+    # log error message from backend
+    while IFS= read -r line; do
+	log "$line"
+    done <<EOF
+$out
+EOF
+    return 1
+}
+
 # Unpacks a given oci-archive.tar[.gz] in the current directory.  Sanity
 # checks, at least one index.json in the top-level dir of the archive.
 # If there are more index files, this function does not handle them.
 unpack_archive()
 {
-    image=$1
-    name=$2
+    uri=$1
+    tag=$2
+    img=$(basename "$uri")

    # Supported transports for load and create
-    case "$image" in
+    case "$uri" in
 	oci:*)			# Unpacked OCI image
-	    file=${image#oci:}
+	    file=${uri#oci:}
 	    ;;
 	oci-archive:*)		# Packed OCI image, .tar or .tar.gz format
-	    file=${image#oci-archive:}
+	    file=${uri#oci-archive:}
 	    ;;
+	ftp://* | http://* | https://*)
+            if ! file=$(fetch "$uri"); then
+		return 1
+	    fi
+            ;;
 	*)			# docker://*, docker-archive:*, or URL
-	    echo "$image"
+	    if podman image exists "$img"; then
+		echo "$img"
+		return 0
+	    fi
+	    # XXX: use --retry=0 with Podman 5.0 or later.
+	    if ! id=$(podman pull --quiet "$uri"); then
+		log "Failed pulling $uri"
+		return 1
+	    fi
+	    # Echo image tag to caller
+	    podman images --filter id="$id" --format "{{.Repository}}:{{.Tag}}"
 	    return 0
 	    ;;
    esac

    if [ ! -e "$file" ]; then
-	if [ -e "/var/lib/containers/oci/$file" ]; then
-	    file="/var/lib/containers/oci/$file"
-	elif [ -e "/lib/oci/$file" ]; then
-	    file="/lib/oci/$file"
+	if [ -e "$DOWNLOADS/$file" ]; then
+	    file="$DOWNLOADS/$file"
+	elif [ -e "$BUILTIN/$file" ]; then
+	    file="$BUILTIN/$file"
 	else
-	    log "Error: cannot find OCI archive $file in search path."
-	    exit 1
+	    err 1 "cannot find OCI archive $file in URI $uri"
 	fi
    fi

    if [ -d "$file" ]; then
 	index=$(find "$file" -name index.json)
 	if [ -z "$index" ]; then
-	    log "Error: cannot find index.json in OCI image $file"
-	    exit 1
+	    err 1 "cannot find index.json in OCI image $file"
 	fi
    else
+	cd "$TMPDIR" || err 0 "failed cd $TMPDIR, wiill use $(pwd) for OCI archive extraction."
+
 	index=$(tar tf "$file" |grep index.json)
 	if [ -z "$index" ]; then
-	    log "Error: invalid OCI archive, cannot find index.json in $file"
-	    exit 1
+	    err 1 "invalid OCI archive, cannot find index.json in $file"
 	fi

 	[ -n "$quiet" ] || log "Extracting OCI archive $file ..."
-        tar xf "$file" || (log "Error: failed unpacking $file in $(pwd)"; exit 1)
-	remove=true
+        tar xf "$file"  || err 1 "failed unpacking $file in $(pwd)"
+	extracted=true
    fi

    dir=$(dirname "$index")
+    if echo "$dir" | grep -q ":"; then
+        if [ -z "$tag" ]; then
+            tag="$dir"
+        fi
+        sanitized_dir=$(echo "$dir" | cut -d':' -f1)
+        mv "$dir" "$sanitized_dir" || err 1 "failed renaming $dir to $sanitized_dir"
+        dir="$sanitized_dir"
+    fi
+
    [ -n "$quiet" ] || log "Loading OCI image $dir ..."
    podman load -qi "$dir"        >/dev/null

-    # Rename image from podman default $dir:latest
-    if [ -n "$name" ]; then
-	podman tag "$dir" "$name" >/dev/null
-	podman rmi "$dir"         >/dev/null
+    # Clean up after ourselves
+    if [ -n "$extracted" ]; then
+	log "Cleaning up extracted $dir"
+	rm -rf "$dir"
+    fi
+
+    # Retag image from podman default $dir:latest
+    if [ -n "$tag" ]; then
+	podman tag "$dir" "$tag" >/dev/null
+	podman rmi "$dir"        >/dev/null
    else
-	name=$dir
+	tag=$dir
    fi

-    if [ "$remove" = "true" ]; then
-	rm -rf "$file"
-    fi
-
-    echo "$name"
+    echo "$tag"
 }

 running()
 {
-    run=$(podman inspect "$1" 2>/dev/null |jq .[].State.Running)
-    [ "$run" = "true" ] && return 0
+    status=$(podman inspect -f '{{.State.Status}}' "$1" 2>/dev/null)
+    [ "$status" = "running" ] && return 0
    return 1
 }

@@ -102,16 +228,19 @@ create()

    # Unpack and load docker-archive/oci/oci-archive, returning image
    # name, or return docker:// URL for download.
-    image=$(unpack_archive "$image")
-
-    if [ -z "$logging" ]; then
-	logging="--log-driver k8s-file --log-opt path=/run/containers/$name.fifo"
+    if ! image=$(unpack_archive "$image"); then
+	exit 1
    fi

-    args="$args --replace --quiet --cgroup-parent=containers $caps"
+    if [ -z "$logging" ]; then
+	logging="--log-driver syslog"
+    fi
+
+    # When we get here we've already fetched, or pulled, the image
+    args="$args --read-only --replace --quiet --cgroup-parent=containers $caps"
    args="$args --restart=$restart --systemd=false --tz=local $privileged"
-    args="$args $ro $vol $mount $hostname $entrypoint $env $port $logging"
-    pidfn=/run/container:${name}.pid
+    args="$args $vol $mount $hostname $entrypoint $env $port $logging"
+    pidfile=/run/container:${name}.pid

    [ -n "$quiet" ] || log "---------------------------------------"
    [ -n "$quiet" ] || log "Got name: $name image: $image"
@@ -134,22 +263,22 @@ create()
    fi

    # shellcheck disable=SC2048
-    log "Calling podman create --name $name --conmon-pidfile=$pidfn $args $image $*"
-    if podman create --name "$name" --conmon-pidfile="$pidfn" $args "$image" $*; then
-	[ -n "$quiet" ] || log "Successfully created container $name from $image"
-	rm -f "/run/containers/env/${name}.env"
+    log "podman create --name $name --conmon-pidfile=$pidfile $args $image $*"
+    if podman create --name "$name" --conmon-pidfile="$pidfile" $args "$image" $*; then
+	[ -n "$quiet"  ] || log "Successfully created container $name from $image"
 	[ -n "$manual" ] || start "$name"
+
+	# Should already be enabled by confd (this is for manual use)
+	initctl -bnq enable "container@${name}.conf"
 	exit 0
    fi

-    log "Error: failed creating container $name, please check the configuration."
-    exit 1
+    err 1 "failed creating container $name, please check the configuration."
 }

 delete()
 {
    name=$1
-    image=$2

    if [ -z "$name" ]; then
 	echo "Usage:"
@@ -157,18 +286,30 @@ delete()
 	exit 1
    fi

+    # Should already be stopped, but if not ...
+    log "$name: should already be stopped, double checking ..."
+    container stop "$name" >/dev/null
+
+    while running "$name"; do
+	log "$name: still running, waiting for it to stop ..."
+	_=$((timeout -= 1))
+	if [ $timeout -le 0 ]; then
+	    err 1 "timed out waiting for container $1 to stop before deleting it."
+	fi
+	sleep 1
+    done
+
+    log "$name: calling podman rm -vif ..."
    podman rm -vif "$name" >/dev/null 2>&1
    [ -n "$quiet" ] || log "Container $name has been removed."
 }

 waitfor()
 {
-    timeout=$2
    while [ ! -f "$1" ]; do
 	_=$((timeout -= 1))
 	if [ $timeout -le 0 ]; then
-	    log "Timeout waiting for $1, aborting!"
-	    exit 1
+	    err 1 "timed out waiting for $1, aborting!"
 	fi
 	sleep 1;
    done
@@ -183,7 +324,7 @@ start()
 	return
    fi

-    initctl -bq cond set "container:$name"
+    initctl start container:$name
    # Real work is done by wrap() courtesy of finit sysv emulation
 }

@@ -196,7 +337,7 @@ stop()
 	return
    fi

-    initctl -bq cond clr "container:$name"
+    initctl stop container:$name
    # Real work is done by wrap() courtesy of finit sysv emulation
 }

@@ -204,8 +345,27 @@ wrap()
 {
    name=$1
    cmd=$2
+    pidfile=$(pidfn "$name")

-    podman "$cmd" "$name"
+    # Containers have three phases: setup, running, and teardown.
+
+    # The setup phase may run forever in the background trying to fetch
+    # the image.  It saves its PID in /run/containers/${name}.pid
+    if [ "$cmd" = "stop" ] && [ -f "$pidfile" ]; then
+        pid=$(cat "$pidfile")
+
+	# Check if setup is still running ...
+	if kill -0 "$pid" 2>/dev/null; then
+            kill "$pid"
+            wait "$pid" 2>/dev/null
+        fi
+
+        rm -f "$pidfile"
+        return 0
+    fi
+
+    # Skip "echo $name" from podman start in log
+    podman "$cmd" "$name" >/dev/null
 }

 # Removes network $1 from all containers
@@ -236,6 +396,19 @@ netrestart()
    done
 }

+cleanup()
+{
+    pidfile=$(pidfn "$name")
+
+    log "Received signal, exiting."
+    if [ -n "$name" ] && [ -f "$pidfile" ]; then
+	log "$name: in setup phase, removing $pidfile ..."
+	rm -f "$pidfile"
+    fi
+
+    exit 1
+}
+
 usage()
 {
 	cat <<EOF
@@ -248,6 +421,7 @@ options:
      --dns-search LIST    Set host lookup search list when creating container
      --cap-add CAP        Add capability to unprivileged container
      --cap-drop CAP       Drop capability, for privileged containter
+      --checksum TYPE:SUM  Use md5/sha256/sha512 to verify ftp/http/https archives
  -c, --creds USR[:PWD]    Credentials to pass to curl -u for remote ops
  -d, --detach             Detach a container started with 'run IMG [CMD]'
  -e, --env FILE           Environment variables when creating container
@@ -267,14 +441,15 @@ options:
                           Syntax: [[ip:][hostPort]:]containerPort[/protocol]
  -q, --quiet              Quiet operation, called from confd
  -r, --restart POLICY     One of "no", "always", or "on-failure:NUM"
-      --read-only          Do not create a writable layer
  -s, --simple             Show output in simplified format
+  -t, --timeout SEC        Set timeout for delete/restart commands, default: 20
  -v, --volume NAME:PATH   Create named volume mounted inside container on PATH

 commands:
  create   NAME IMAGE NET  Create container NAME using IMAGE with networks NET
  delete  [network] NAME   Remove container NAME or network NAME from all containers
  exec     NAME CMD        Run a command inside a container
+  flush                    Clean up lingering containers and associated anonymous volumes
  find    [ifname PID]     Find PID of container where '--net IFNAME' currently lives
                           or, find the name of our IFNAME inside the container @PID
  help                     Show this help text
@@ -285,11 +460,13 @@ commands:
  restart [network] NAME   Restart a (crashed) container or container(s) using network
  run      NAME [CMD]      Run a container interactively, with an optional command
  save     IMAGE FILE      Save a container image to an OCI tarball FILE[.tar.gz]
-  shell                    Start a shell inside a container
+  setup    NAME            Create and set up container as a Finit task
+  shell   [CMD]            Start a shell, or run CMD, inside a container
  show    [image | volume] Show containers, images, or volumes
  stat                     Show continuous stats about containers (Ctrl-C aborts)
  start   [NAME]           Start a container, see -n
  stop    [NAME]           Stop a container, see -n
+  upgrade  NAME            Upgrade a running container (stop, pull, restart)
  volume  [prune]          Prune unused volumes
 EOF
 }
@@ -307,6 +484,25 @@ while [ "$1" != "" ]; do
 	    shift
 	    caps="$caps --cap-drop=$1"
 	    ;;
+	--checksum)
+	    shift
+	    type="${1%%:*}"
+	    checksum="${1#*:}"
+	    case "$type" in
+		md5)
+		    cmdsum=md5sum
+		    ;;
+		sha256)
+		    cmdsum=sha256sum
+		    ;;
+		sha512)
+		    cmdsum=sha512sum
+		    ;;
+		*)
+		    err 1 "Unsupported checksum type: $type"
+		    ;;
+	    esac
+	    ;;
 	-c | --creds)
 	    shift
 	    creds="-u $1"
@@ -351,11 +547,10 @@ while [ "$1" != "" ]; do
 	--log-path)
 	    shift
 	    logging="$logging --log-opt path=$1"
-	    log_path="$1"
 	    ;;
 	-m | --mount)
 	    shift
-	    mount="--mount=$1"
+	    mount="$mount --mount=$1"
 	    ;;
 	--manual)
 	    manual=true
@@ -386,12 +581,13 @@ while [ "$1" != "" ]; do
 	    shift
 	    restart=$1
 	    ;;
-	--read-only)
-	    ro="--read-only=true"
-	    ;;
 	-s | --simple)
 	    simple=true
 	    ;;
+	-t | --timeout)
+	    shift
+	    timeout=$1
+	    ;;
 	-v | --volume)
 	    shift
 	    vol="$vol -v $1"
@@ -408,6 +604,8 @@ if [ -n "$cmd" ]; then
    shift
 fi

+trap cleanup INT HUP TERM
+
 case $cmd in
    # Does not work atm., cannot attach to TTY because
    # we monitor 'podman start -ai foo' with Finit.
@@ -420,15 +618,24 @@ case $cmd in
 	;;
    delete)
 	cmd=$1
-	name=$2
+	[ -n "$name" ] || name=$2
 	if [ "$cmd" = "network" ] && [ -n "$name" ]; then
 	    netwrm "$name"
 	else
-	    delete "$@"
+	    [ -n "$name" ] || name=$1
+	    delete "$name"
 	fi
 	;;
    exec)
-	podman exec -it "$@"
+	if [ -z "$name" ]; then
+	    name="$1"
+	    shift
+	fi
+	podman exec -i "$name" "$@"
+	;;
+    flush)
+	echo "Cleaning up any lingering containers";
+	podman rm -av $force
 	;;
    find)
 	cmd=$1
@@ -455,25 +662,12 @@ case $cmd in
 	usage
 	;;
    load)
-	url=$1
-	name=$2
 	# shellcheck disable=SC2086
-	if echo "$url" | grep -q "://"; then
-	    file=$(basename "$url")
-            curl -k $creds -Lo "$file" "$url"
-	else
-            file="$url"
-	fi
-
-	# shellcheck disable=SC2086
-	name=$(unpack_archive "$file" $name)
+	name=$(unpack_archive "$1" $2)
+	[ -n "$name" ] || exit 1

 	# Show resulting image(s) matching $name
-	if [ -n "$name" ]; then
-	    podman images -n "$name"
-	else
-	    exit 1
-	fi
+	podman images -n "$name"
 	;;
    locate)			# Find where the host's ifname lives
 	if [ -z "$network" ]; then
@@ -500,9 +694,9 @@ case $cmd in
 		podman images $all --format "{{.Repository}}:{{.Tag}}"
 		;;
 	    oci)
-		find /lib/oci /var/lib/containers/oci -type f 2>/dev/null
+		find $BUILTIN $DOWNLOADS -type f 2>/dev/null
 		;;
-	    *)		
+	    *)
 		podman ps $all --format "{{.Names}}"
 		;;
 	esac
@@ -542,8 +736,38 @@ case $cmd in
 	    gzip "$file"
 	fi
 	;;
+    setup)
+	[ -n "$name" ] || err 1 "setup: missing container name."
+	script=/run/containers/${name}.sh
+	[ -x "$script" ] || err 1 "setup: $script does not exist or is not executable."
+
+	# Save our PID in case we get stuck here and someone wants to
+	# stop us, e.g., due to reconfiguration or reboot.
+	pidfile=$(pidfn "${name}")
+	echo $$ > "$pidfile"
+
+	while ! "$script"; do
+            log "${name}: setup failed, waiting for network changes ..."
+	    read -t 60 _ < <(ip monitor address route)
+
+	    # On IP address/route changes, wait a few seconds more to ensure
+	    # the system has ample time to react and set things up for us.
+	    log "${name}: retrying ..."
+	    sleep 2
+	done
+
+	rm -f "$pidfile"
+	;;
    shell)
-	podman exec -it "$1" sh -l
+	if [ -z "$name" ]; then
+	    name="$1"
+	    shift
+	fi
+	if [ $# -gt 0 ]; then
+	    podman exec -i "$name" sh -c "$*"
+	else
+	    podman exec -it "$name" sh -l
+	fi
 	;;
    show)
 	cmd=$1
@@ -596,12 +820,10 @@ case $cmd in
 	    else
 		name=$1
 		stop "$name"
-		timeout=20
 		while running "$name"; do
 		    _=$((timeout -= 1))
 		    if [ $timeout -le 0 ]; then
-			log "Timeout waiting for container $1 to stop before restarting it."
-			exit 1
+			err 1 "timed out waiting for container $1 to stop before restarting it."
 		    fi
 		    sleep 1
 		done
@@ -627,7 +849,7 @@ case $cmd in
 	;;
    upgrade)
 	# Start script used to initially create container
-	script=/var/lib/containers/active/S01-${1}.sh
+	script=/run/containers/${1}.sh

 	# Find container image
 	img=$(podman inspect "$1" | jq -r .[].ImageName)
@@ -638,15 +860,15 @@ case $cmd in

 	# Likely an OCI archive, or local directory, assume user has updated image.
 	if echo "$img" | grep -Eq '^localhost/'; then
-	    file=$(awk '{s=$NF} END{print s}' "$script")
-	    echo "Upgrading container ${1} with local archive: $file ..."
+	    file=$(awk '/^# meta-image:/ {print $3}' "$script")
+	    echo ">> Upgrading container $1 using $file ..."
 	else
 	    printf ">> Stopping ... "
 	    podman stop "$1"
 	    printf ">> "
 	    podman pull "$img" || (echo "Failed fetching $img, check your network (settings)."; exit 1)
+	    echo ">> Starting $1 ..."
 	fi
-	echo ">> Starting $1 ..."
 	if ! "$script"; then
 	    echo ">> Failed recreating container $1"
 	    exit 1
@@ -658,7 +880,7 @@ case $cmd in
 	[ -n "$cmd" ] && shift
 	case $cmd in
 	    prune)
-		podman volume $force prune
+		podman volume prune $force
 		;;
 	    *)
 		false
@@ -666,6 +888,22 @@ case $cmd in
 	esac
 	;;
    *)
+	if [ -n "$SERVICE_SCRIPT_TYPE" ] && [ -n "$SERVICE_ID" ]; then
+	    case "$SERVICE_SCRIPT_TYPE" in
+		pre)
+		    # Called as pre-script from Finit service
+		    exec $container -q -n "$SERVICE_ID" setup
+		    ;;
+		cleanup)
+		    # Called as cleanup-script from Finit service
+		    log "Calling $container -n $SERVICE_ID delete"
+		    exec $container -q -n "$SERVICE_ID" delete
+		    ;;
+		*)
+		    false
+		    ;;
+	    esac
+	fi
 	usage
 	exit 1
 	;;
@@ -50,7 +50,7 @@ set_dhcp_routes()
 	# format: dest1/mask gw1 ... destn/mask gwn
 	set -- $staticroutes
 	while [ -n "$1" -a -n "$2" ]; do
-	    log "adding route $1 via $2 dev $interface proto dhcp"
+	    log "adding route $1 via $2 metric $metric tag 100"
 	    echo "ip route $1 $2 $metric tag 100" >> "$NEXT"
 	    shift 2
 	done
@@ -115,7 +115,7 @@ case "$ACTION" in
 	    /usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface
 	fi

-	if /bin/ip addr add dev $interface $ip/$subnet $BROADCAST proto 5; then
+	if /bin/ip addr add dev $interface $ip/$subnet $BROADCAST proto dhcp; then
 	    echo "$ip" > "$IP_CACHE"
 	fi
 	if [ -n "$ipv6" ] ; then
@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# Check if an infix board is selected
+
+if [ $# -ne 2 ]; then
+	echo "usage: $0 <INFIX-DIR> <OUTPUT>"
+	exit 1
+fi
+ROOT=$1
+O=$2
+BOARD_SRC_DIR="${ROOT}/src/board"
+BOARD_PACKAGE_DIR="${ROOT}/package/board"
+CONFIG_FILE="${O}/.config"
+
+is_board_enabled() {
+    local symbol=$1
+
+    if [ -f "$CONFIG_FILE" ]; then
+        if grep -q "^${symbol}=y" "$CONFIG_FILE" 2>/dev/null; then
+            return 0  # enabled
+        else
+            return 1  # disabled or not set
+        fi
+    else
+        echo "Warning: No .config file found. Run 'make menuconfig' first."
+        return 1
+    fi
+}
+
+get_actual_config_symbol() {
+    local board_name=$1
+    local config_file="${BOARD_PACKAGE_DIR}/$board_name/Config.in"
+
+    if [ -f "$config_file" ]; then
+        # Extract the first config symbol from the Config.in file
+        local symbol=$(grep -m1 "^config " "$config_file" 2>/dev/null | awk '{print $2}')
+        if [ -n "$symbol" ]; then
+            echo "$symbol"
+            return 0
+        fi
+    fi
+
+    # Fallback to predicted symbol if no Config.in found
+    echo "BR2_PACKAGE_BOARD_$(echo "$board_name" | tr '[:lower:]' '[:upper:]' | tr '-' '_')"
+    return 1
+}
+
+boards=""
+
+for board_path in "$BOARD_SRC_DIR"/*; do
+    if [ -d "$board_path" ]; then
+        board_name=$(basename "$board_path")
+        config_symbol=$(get_actual_config_symbol "$board_name")
+
+        if is_board_enabled "$config_symbol"; then
+	    boards="$boards $board_name"
+        fi
+    fi
+done
+
+echo "$boards"
@@ -17,14 +17,23 @@ endef
 # U-Boot build tree. This will then be built in to the final U-Boot
 # image's control DT via the CONFIG_DEVICE_TREE_INCLUDES option (see
 # extras.config).
+#
+# Some platforms, most notably Raspberry Pi, load the device tree
+# from the SPL, effectively overriding the built-in control DT.
+# For that we bundle an overlay that can be included instead.
 define UBOOT_PRE_BUILD_INSTALL_KEY
-	$(HOST_DIR)/bin/dtc <(echo '/dts-v1/; / { signature {}; };') >$(@D)/infix-key.dtb
+	$(HOST_DIR)/bin/dtc -a 1024 <(echo '/dts-v1/; / { signature {}; };') \
+		>$(@D)/infix-key.dtb
 	$(foreach key, \
 		$(call qstrip,$(TRUSTED_KEYS_DEVELOPMENT_PATH)) $(call qstrip,$(TRUSTED_KEYS_EXTRA_PATH)),\
 		$(call uboot-add-pubkey,$(key),$(@D)/infix-key.dtb))
 	$(HOST_DIR)/bin/dtc -I dtb -O dts \
 		<$(@D)/infix-key.dtb \
-	| sed -e 's:/dts-v[0-9]\+/;::' >$(@D)/arch/$(UBOOT_ARCH)/dts/infix-key.dtsi
+		| sed -e 's:/dts-v[0-9]\+/;::' \
+		| tee $(@D)/arch/$(UBOOT_ARCH)/dts/infix-key.dtsi \
+		| sed -e '1i\/dts-v1/;\n/plugin/;\n' -e '/^$$/d' -e 's:/ {:\&{/} {:' \
+		>$(@D)/arch/$(UBOOT_ARCH)/dts/infix-key.dtso
+
 	rm $(@D)/infix-key.dtb
 endef
 UBOOT_PRE_BUILD_HOOKS += UBOOT_PRE_BUILD_INSTALL_KEY
@@ -33,6 +33,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_PROFILING=y
 CONFIG_SMP=y
 CONFIG_EFI=y
+CONFIG_KPROBES=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -144,7 +145,6 @@ 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
@@ -161,12 +161,14 @@ CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=y
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_PKTGEN=y
 # CONFIG_WIRELESS is not set
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
 CONFIG_LWTUNNEL=y
 CONFIG_PCI=y
+CONFIG_PCI_MSI=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
@@ -208,6 +210,7 @@ CONFIG_NET_VRF=y
 CONFIG_E1000=y
 CONFIG_NE2K_PCI=y
 CONFIG_8139CP=y
+CONFIG_ROCKER=y
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_SERIAL_8250=y
@@ -264,5 +267,5 @@ CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_TIMEOUT=20
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
-# CONFIG_FTRACE is not set
+CONFIG_FUNCTION_TRACER=y
 CONFIG_UNWINDER_FRAME_POINTER=y
@@ -13,8 +13,8 @@ BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
 BR2_INIT_FINIT=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs"
-# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
 BR2_ROOTFS_MERGED_USR=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
 BR2_SYSTEM_BIN_SH_BASH=y
 BR2_TARGET_GENERIC_GETTY_PORT="@console"
 BR2_TARGET_GENERIC_GETTY_TERM="xterm"
@@ -27,17 +27,14 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="alder/alder styx/dcp-sc-28p-a styx/dcp-sc-28p-b marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra marvell/cn9130-crb-A marvell/cn9130-crb-B microchip/sparx5_pcb135_emmc_no_psci"
-BR2_LINUX_KERNEL_CUSTOM_DTS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/dts"
-BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_DBUS_CXX=y
@@ -59,8 +56,8 @@ BR2_PACKAGE_PYTHON_GUNICORN=y
 BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBSSH2_OPENSSL=y
-BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
+BR2_PACKAGE_LIBINPUT=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_NETOPEER2_CLI=y
 BR2_PACKAGE_NSS_MDNS=y
@@ -80,6 +77,7 @@ BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPUTILS=y
 BR2_PACKAGE_LLDPD=y
+BR2_PACKAGE_MSTPD=y
 BR2_PACKAGE_NETCALC=y
 BR2_PACKAGE_NETCAT_OPENBSD=y
 BR2_PACKAGE_NETSNMP=y
@@ -109,6 +107,7 @@ BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
 BR2_PACKAGE_RAUC_GPT=y
 BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_RAUC_JSON=y
 BR2_PACKAGE_SYSKLOGD=y
 BR2_PACKAGE_SYSKLOGD_LOGGER=y
 BR2_PACKAGE_WATCHDOGD=y
@@ -121,22 +120,28 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
 BR2_PACKAGE_HOST_GENEXT2FS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_GO_BIN=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 INFIX_VENDOR_HOME="https://github.com/kernelkit"
-INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set up both as a switch, with offloading using switchdev, and a router with firewalling."
+INFIX_DESC="Infix is an operating system based on Linux and modeled with YANG.  It can be set up both as a switch, with offloading using switchdev, a router with firewalling, or a secure end device.  All while supporting advanced networking scenarios and running Docker containers."
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+BR2_PACKAGE_ALDER_ALDER=y
+BR2_PACKAGE_MARVELL_CN9130_CRB=y
+BR2_PACKAGE_MARVELL_ESPRESSOBIN=y
+BR2_PACKAGE_STYX_DCP_SC_28P=y
+BR2_PACKAGE_RASPBERRY_PI_4=y
 BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_CURIOS_HTTPD=y
 BR2_PACKAGE_CURIOS_NFTABLES=y
-BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -147,7 +152,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc"
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
-BR2_PACKAGE_K8S_LOGGER=y
 BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LANDING=y
@@ -161,10 +165,14 @@ BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER=y
 BR2_PACKAGE_PODMAN_DRIVER_VFS=y
 BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
-BR2_PACKAGE_LIBINPUT=y
+BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
+BR2_PACKAGE_FEATURE_WIFI=y
+BR2_PACKAGE_FEATURE_WIFI_DONGLE_REALTEK=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
-DISK_IMAGE_BOOT_BIN=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
+DISK_IMAGE_BOOT_BIN=y
 GNS3_APPLIANCE_RAM=512
 GNS3_APPLIANCE_IFNUM=10
@@ -27,17 +27,14 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="alder/alder styx/dcp-sc-28p-a styx/dcp-sc-28p-b marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra marvell/cn9130-crb-A marvell/cn9130-crb-B microchip/sparx5_pcb135_emmc_no_psci"
-BR2_LINUX_KERNEL_CUSTOM_DTS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/dts"
-BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_DBUS_CXX=y
@@ -75,6 +72,7 @@ BR2_PACKAGE_FRR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPUTILS=y
 BR2_PACKAGE_LLDPD=y
+BR2_PACKAGE_MSTPD=y
 BR2_PACKAGE_NETCALC=y
 BR2_PACKAGE_NGINX=y
 BR2_PACKAGE_NGINX_HTTP_SSL_MODULE=y
@@ -92,6 +90,7 @@ BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
 BR2_PACKAGE_RAUC_GPT=y
 BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_RAUC_JSON=y
 BR2_PACKAGE_SYSKLOGD=y
 BR2_PACKAGE_SYSKLOGD_LOGGER=y
 BR2_PACKAGE_WATCHDOGD=y
@@ -109,14 +108,19 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 INFIX_VENDOR_HOME="https://github.com/kernelkit"
-INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set up both as a switch, with offloading using switchdev, and a router with firewalling."
+INFIX_DESC="Infix is an operating system based on Linux and modeled with YANG.  It can be set up both as a switch, with offloading using switchdev, a router with firewalling, or a secure end device.  All while supporting advanced networking scenarios and running Docker containers."
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+BR2_PACKAGE_ALDER_ALDER=y
+BR2_PACKAGE_MARVELL_CN9130_CRB=y
+BR2_PACKAGE_MARVELL_ESPRESSOBIN=y
+BR2_PACKAGE_STYX_DCP_SC_28P=y
 BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -134,6 +138,9 @@ BR2_PACKAGE_MCD=y
 BR2_PACKAGE_MDNS_ALIAS=y
 BR2_PACKAGE_LIBINPUT=y
 BR2_PACKAGE_ROUSETTE=y
+BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 DISK_IMAGE_BOOT_BIN=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
@@ -8,7 +8,6 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache"
 BR2_ENABLE_DEBUG=y
 BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches"
-BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="infix"
 BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
 BR2_INIT_FINIT=y
@@ -30,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"
@@ -42,6 +41,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_INFIX_PATH)/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
@@ -74,7 +74,6 @@ BR2_PACKAGE_PYTHON_GUNICORN=y
 BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBSSH2_OPENSSL=y
-BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBINPUT=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -128,6 +127,7 @@ BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
 BR2_PACKAGE_RAUC_GPT=y
 BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_RAUC_JSON=y
 BR2_PACKAGE_SYSKLOGD=y
 BR2_PACKAGE_SYSKLOGD_LOGGER=y
 BR2_PACKAGE_WATCHDOGD=y
@@ -170,14 +170,14 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 INFIX_VENDOR_HOME="https://github.com/kernelkit"
 INFIX_IMAGE_ID="${INFIX_ID}-r2s"
-INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set up both as a switch, with offloading using switchdev, and a router with firewalling."
+INFIX_DESC="Infix is an operating system based on Linux and modeled with YANG.  It can be set up both as a switch, with offloading using switchdev, a router with firewalling, or a secure end device.  All while supporting advanced networking scenarios and running Docker containers."
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_CONFD=y
-BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -188,7 +188,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc"
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
-BR2_PACKAGE_K8S_LOGGER=y
 BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LANDING=y
@@ -202,7 +201,10 @@ BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER=y
 BR2_PACKAGE_PODMAN_DRIVER_VFS=y
 BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
+BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 # GNS3_APPLIANCE is not set
@@ -39,6 +39,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_INFIX_PATH)/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
@@ -88,6 +89,7 @@ BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPUTILS=y
 BR2_PACKAGE_LLDPD=y
+BR2_PACKAGE_MSTPD=y
 BR2_PACKAGE_NETCALC=y
 BR2_PACKAGE_NETCAT_OPENBSD=y
 BR2_PACKAGE_NETSNMP=y
@@ -117,6 +119,7 @@ BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
 BR2_PACKAGE_RAUC_GPT=y
 BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_RAUC_JSON=y
 BR2_PACKAGE_SYSKLOGD=y
 BR2_PACKAGE_SYSKLOGD_LOGGER=y
 BR2_PACKAGE_WATCHDOGD=y
@@ -159,15 +162,15 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 INFIX_VENDOR_HOME="https://github.com/kernelkit"
-INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set up both as a switch, with offloading using switchdev, and a router with firewalling."
+INFIX_DESC="Infix is an operating system based on Linux and modeled with YANG.  It can be set up both as a switch, with offloading using switchdev, a router with firewalling, or a secure end device.  All while supporting advanced networking scenarios and running Docker containers."
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_CONFD=y
 # BR2_PACKAGE_CONFD_TEST_MODE is not set
-BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -178,7 +181,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc"
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
-BR2_PACKAGE_K8S_LOGGER=y
 BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LANDING=y
@@ -193,6 +195,9 @@ BR2_PACKAGE_PODMAN_DRIVER_VFS=y
 BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
+BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 # GNS3_APPLIANCE is not set
@@ -12,8 +12,8 @@ BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
 BR2_INIT_FINIT=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs"
-# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
 BR2_ROOTFS_MERGED_USR=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
 BR2_SYSTEM_BIN_SH_BASH=y
 BR2_TARGET_GENERIC_GETTY_PORT="@console"
 BR2_TARGET_GENERIC_GETTY_TERM="xterm"
@@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -34,6 +34,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_DBUS_CXX=y
@@ -54,10 +55,8 @@ BR2_PACKAGE_PYTHON_GUNICORN=y
 BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBSSH2_OPENSSL=y
-BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_LIBMNL=y
 BR2_PACKAGE_NETOPEER2_CLI=y
 BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_LINUX_PAM=y
@@ -76,6 +75,7 @@ BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPUTILS=y
 BR2_PACKAGE_LLDPD=y
+BR2_PACKAGE_MSTPD=y
 BR2_PACKAGE_NETCALC=y
 BR2_PACKAGE_NETCAT_OPENBSD=y
 BR2_PACKAGE_NETSNMP=y
@@ -105,6 +105,7 @@ BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
 BR2_PACKAGE_RAUC_GPT=y
 BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_RAUC_JSON=y
 BR2_PACKAGE_SYSKLOGD=y
 BR2_PACKAGE_SYSKLOGD_LOGGER=y
 BR2_PACKAGE_WATCHDOGD=y
@@ -124,13 +125,14 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
 BR2_PACKAGE_HOST_GENEXT2FS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_GO_BIN=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 INFIX_VENDOR_HOME="https://github.com/kernelkit"
-INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set up both as a switch, with offloading using switchdev, and a router with firewalling."
+INFIX_DESC="Infix is an operating system based on Linux and modeled with YANG.  It can be set up both as a switch, with offloading using switchdev, a router with firewalling, or a secure end device.  All while supporting advanced networking scenarios and running Docker containers."
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
@@ -138,9 +140,9 @@ BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_CURIOS_HTTPD=y
 BR2_PACKAGE_CURIOS_NFTABLES=y
-BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -151,7 +153,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc"
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
-BR2_PACKAGE_K8S_LOGGER=y
 BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LANDING=y
@@ -165,7 +166,12 @@ BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER=y
 BR2_PACKAGE_PODMAN_DRIVER_VFS=y
 BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
+BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
+BR2_PACKAGE_FEATURE_WIFI=y
+BR2_PACKAGE_FEATURE_WIFI_DONGLE_REALTEK=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 GNS3_APPLIANCE_RAM=512
@@ -7,13 +7,14 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache"
 BR2_ENABLE_DEBUG=y
 BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="ix"
 BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
 BR2_INIT_FINIT=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs"
-# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
 BR2_ROOTFS_MERGED_USR=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
 BR2_SYSTEM_BIN_SH_BASH=y
 BR2_TARGET_GENERIC_GETTY_PORT="@console"
 BR2_TARGET_GENERIC_GETTY_TERM="xterm"
@@ -26,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -34,6 +35,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_DBUS_CXX=y
@@ -50,10 +52,7 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
 BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_PYTHON3=y
-BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
-BR2_PACKAGE_LIBSSH2_OPENSSL=y
-BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBMNL=y
@@ -71,6 +70,7 @@ BR2_PACKAGE_FRR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPUTILS=y
 BR2_PACKAGE_LLDPD=y
+BR2_PACKAGE_MSTPD=y
 BR2_PACKAGE_NETCALC=y
 BR2_PACKAGE_NGINX=y
 BR2_PACKAGE_NGINX_HTTP_SSL_MODULE=y
@@ -82,12 +82,14 @@ BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_WHOIS=y
 BR2_PACKAGE_BASH_COMPLETION=y
 BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_GETENT=y
 BR2_PACKAGE_KMOD_TOOLS=y
 BR2_PACKAGE_PWGEN=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
 BR2_PACKAGE_RAUC_GPT=y
 BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_RAUC_JSON=y
 BR2_PACKAGE_SYSKLOGD=y
 BR2_PACKAGE_SYSKLOGD_LOGGER=y
 BR2_PACKAGE_WATCHDOGD=y
@@ -113,7 +115,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 INFIX_VENDOR_HOME="https://github.com/kernelkit"
-INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set up both as a switch, with offloading using switchdev, and a router with firewalling."
+INFIX_DESC="Infix is an operating system based on Linux and modeled with YANG.  It can be set up both as a switch, with offloading using switchdev, a router with firewalling, or a secure end device.  All while supporting advanced networking scenarios and running Docker containers."
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
@@ -136,7 +138,9 @@ BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LOWDOWN=y
 BR2_PACKAGE_MCD=y
 BR2_PACKAGE_MDNS_ALIAS=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_ROUSETTE=y
+BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 GNS3_APPLIANCE_RAM=512
@@ -3,8 +3,299 @@ Change Log

 All notable changes to the project are documented in this file.

+[v25.07.0][UNRELEASED] -
+-------------------------

-[v24.10.2][UNRELEASED]
+### Changes
+- Raspberry Pi 4 is now a part of the aarch64 image, as well as a SDcard
+  image for initial deployments.
+
+
+### Fixes
+[v25.06.0][] - 2025-07-01
+-------------------------
+
+### Changes
+- Upgrade Buildroot to 2025.02.4 (LTS)
+- Upgrade Linux kernel to 6.12.35 (LTS)
+- Upgrade curiOS built-in containers to v25.06.0
+- Add support for setting mode of a container content mount, issue #1070
+- Add Wi-Fi client support and add support for some USB-Wi-Fi cards
+- New slogan: Infix OS — Immutable.Friendly.Secure
+
+### Fixes
+- cli: fix by-word movement, detect word barrier using non-alphanum chars
+- cli: fix delete word left/right, make sure to save word in kill buffer
+
+
+[v25.05.1][] - 2025-06-12
+-------------------------
+
+### Changes
+- Upgrade Linux kernel to 6.12.32 (LTS)
+
+### Fixes
+- Fix #1060: Restore of missing CLI commands, regression in Infix v25.05.0
+
+[v25.05.0][] - 2025-05-27
+-------------------------
+
+### Changes
+- Upgrade Buildroot to 2025.02.3 (LTS)
+- Upgrade Linux kernel to 6.12.30 (LTS)
+- Upgrade libyang to 3.12.2
+- Upgrade sysrepo to 3.6.11
+- Upgrade netopeer2 (NETCONF) to 2.4.1
+- New hardware support: Raspberry Pi 4B (aarch64)
+- Add documentation on Infix upgrading and downgrading, issue #1009
+- Add HDMI and USB support for iMX8MP-evk
+- Enforced strict format for LLDP destination MAC address:
+  - Only accepts colon-separated format: `01:80:C2:00:00:0E`
+- Add `show lldp` command to show discovered neighbors per interface.
+- Add configuration support for per-interface LLDP administrative status
+
+### Fixes
+- Fix containers with multiple mounts
+- Correct description for LAG LACP modes
+- Fix #1040: Add `mount` constraint for container config
+
+
+[v25.04.0][] - 2025-04-30
+-------------------------
+
+### Changes
+ - Upgrade Linux kernel to 6.12.25 (LTS)
+ - Upgrade Buildroot to 2025.02.1 (LTS)
+ - Format for disk image (for QEMU) has changed to `qcow2`
+
+### Fixes
+ - Fix #1002: Broken symlink in release package
+ - Fix #1006: NanoPi R2S corrupt startup, regression in Infix v25.02.0
+   - Bump R2S kernel, now same as tier one boards
+ - Fix #1015: Not possible to save custom SSH settings in startup-config
+ - Fix group owner and permissions of `/cfg/backup` directory
+ - Fix extraction of old version for `/cfg/backup/` files
+ - Fix configuration migration issues when upgrading
+
+[v25.03.0][] - 2025-03-31
+-------------------------
+
+> [!IMPORTANT]
+> This release is the first with the new Buildroot 2025.02 (LTS)
+
+### Changes
+ - Upgrade Linux kernel to 6.12.21 (LTS)
+ - Upgrade Buildroot to 2025.02.0 (LTS)
+
+### Fixes
+ - Fix #964: YANG schema warning in syslog: missing 'monitor' node for lag
+ - Fix #980: the system fails to reboot when a container is (stuck), for
+   whatever reason, in its 'setup' state
+ - Fix #990: web console, ttyd service, stopped working after upgrade to
+   Buildroot 2025.02, caused by new (missing) option `--writable`
+ - Fix TCAM memory corruption in `mvpp2` Ethernet controller
+ - Fix annoying (but harmless) usage message from the logger tool when
+   `startup-config` fails to load and the system reverts to failure mode
+ - Fix harmless log warning for product specific init when no product
+   specific init scripts are found
+ - Backport fixes for sysklogd, affecting hostname filtering and periods
+   in TAG names, pending official backport in Buildroot
+
+
+[v25.02.0][] - 2025-03-04
+-------------------------
+
+### Changes
+ - Upgrade Linux kernel to 6.12.18 (LTS)
+ - Upgrade Buildroot to 2024.02.11 (LTS)
+ - Add support for link aggregation (lag), static (balance-xor) and LACP
+ - Add support for the [i.MX 8M Plus EVK][EVK]
+ - YANG type change for SSH private/public keys, from ietf-crypto-types
+   to infix-crypto-types
+ - Disable global IPv6 forwarding by default, enable by per-interface
+   setting.  Note, route advertisements are always accepted.  Issue #785
+ - Drop automatic default route (interface route) for IPv4 autoconf, not
+   necessary and causes more confusion than good.  Issue #923
+ - Update scripting with new RESTCONF examples
+
+### Fixes
+ - Fix #896: `/etc/resolv.conf` not properly generated when system runs
+   in fail secure mode (failing to load `startup-config`)
+ - Fix #902: containers "linger" in the system (state 'exited') after
+   having removed them from the configuration
+ - Fix #930: container configuration changes does not apply at runtime
+   only when saved to `startup-config` and system is rebooted
+ - Fix #936: DHCP server reconfiguration does not always take effect.
+ - Fix #956: CLI `copy` command complains it cannot change owner when
+   copying `factory-config` to `running-config`.  Bogus error, the
+   latter is not really a file
+ - Fix #977: "Operation not permitted" when saving `running-config` to
+   `startup-config` (harmless warning but annoying and concerning)
+
+[EVK]: https://www.nxp.com/design/design-center/development-boards-and-designs/8MPLUSLPD4-EVK
+
+
+[v25.01.0][] - 2025-01-31
+-------------------------
+
+> [!NOTE]
+> This release contains breaking changes in the configuration file
+> syntax for DHCP clients.  Specifically DHCP options *with value*,
+> i.e., the syntax for sending a hexadecimal value now require `hex`
+> prefix before a string of colon-separated pairs of hex values.
+
+### Changes
+
+ - Upgrade Linux kernel to 6.12.11 (LTS)
+ - Upgrade Buildroot to 2024.02.10 (LTS)
+ - Upgrade FRR from 9.1.2 to 9.1.3
+ - Add support for configuring SSH server, issue #441.  As a result,
+   both SSH and NETCONF now use the same host key in `factory-config`
+ - Add operational support for reading DNS resolver info, issue #510
+ - Add operational support for NTP client, issue #510
+ - Add support for more mDNS settings: allow/deny interfaces, acting
+   as "reflector" and filtering of reflected services.  Issue #678
+ - Add DHCPv4 server support, multiple subnets with static hosts and
+   DHCP options on global, subnet, or host level, issue #703.
+   Contributed by [MINEx Networks](https://minexn.com/)
+   - DHCP client options aligned with DHCP server, `startup-config`
+     files with old syntax are automatically migrated
+ - Breaking change in DHCP client options *with value*.  Hexadecimal
+   values must now be formatted as `{ "hex": "c0:ff:ee" }` (JSON)
+ - Add documentation on management via SSH, Web (RESTCONF, Web
+   Console), and Console Port, issue #787
+ - Add documentation of DNS client use and configuration, issue #798
+ - Add support for changing boot order for the system with an RPC,
+   including support for reading boot order from operational datastore
+ - Add support for GRE/GRETAP tunnels
+ - Add support for STP/RSTP on bridges
+ - Add support for VXLAN tunnels
+ - Add support for configuring global LLDP `message-tx-interval`
+
+### Fixes
+
+ - Fix #777: Authorized SSH key not applied to `startup-config`
+ - Fix #829: Avahi (mDNS responder) not starting properly on switches
+   with *many* ports (>10).  This led to a review of `sysctl`:
+   - New for IPv4:
+	 - Adjust IGMP max memberships: 20 -> 1000
+	 - Use neighbor information on nexthop selection
+	 - Use inbound interface address on ICMP errors
+	 - Ignore routes with link down
+	 - Disable `rp_filter`
+     - ARP settings have been changed to better fit routers, i.e.,
+       systems with multiple interfaces:
+	   - Always use best local address when sending ARP
+	   - Only reply to ARP if target IP is on the inbound interface
+	   - Generate ARP requests when device is brought up or HW address changes
+   - New for IPv6:
+	 - Keep static global addresses on link down
+	 - Ignore routes with link down
+ - Fix #861: Fix error when running 251+ reconfigurations in test-mode
+ - Fix #869: Setup of bridges is now more robust
+ - Fix #899: DHCP client with client-id does not work
+ - Minor cleanup of Networking Guide
+ - Fix memory leaks in `confd`
+
+
+[v24.11.1][] - 2024-11-29
+-------------------------
+
+### Changes
+
+ - Upgrade Frr to 9.1.2, fixes an OSPF issue where *Zebra* lost netlink
+   messages and drifted out of sync with the kernel's view of addresses
+   and interfaces available in the system
+ - Allow setting IP address directly on VLAN filtering bridges.  This
+   only works when the bridge is an untagged member of a (single) VLAN.
+ - cli: usability -- showing log files now automatically jump to the end
+   of the file, where the latest events are
+ - cli: usability -- showing container status, or other status that
+   overflows the terminal horizontally, now wrap the lines and exit the
+   pager immediately if the contents fit on the first screen
+ - The default log level of the mDNS responder, `avahi-daemon`, has been
+   adjusted to make it less verbose.  Now only `LOG_NOTICE` and higher
+   severity is logged -- making it very quiet
+
+### Fixes
+
+ - Fix #685: DSA conduit interface not always detected.  Previous
+   attempt at a fix (v24.10.2) mitigated the issue, but did not
+   completely solve it.
+ - Fix #835: redesign how the system creates/deletes containers from the
+   `running-config`.  Prior to this change, all removal and creation was
+   handled by a separate queue that ran asynchronously from the `confd`
+   process.  This could lead to situations where new configurations are
+   applied before the queue had been fully processed.  After this change
+   containers are deleted synchronously and new containers are created
+   in the same flow as during normal runtime operation (start/upgrade)
+ - Fix start of containers with `manual=True` option should now work
+   again, regression in v24.11.0
+ - Fix loss of writable volumes when temporarily disabling a container
+   in the configuration, now the container remains dormant with all its
+   volumes still available
+ - Fix presentation bug in CLI `show interfaces` where all line-drawing
+   characters showed up as hexadecimal values.  Regression in v24.11.0
+ - Fix missing log messages from Frr Zebra daemon
+ - Stop the zeroconf (IPv4LL) agent, `avahi-autoipd`, when removing an
+   interface, e.g., `br0`
+ - Creating more than one container trigger restarts of previously set
+   up containers.  Which in some cases may cause these earlier ones to
+   end up in an inconsistent state
+ - Prevent traffic assigned to locally terminated VLANs from being
+   forwarded, when the underlying ports are simultaneously attached to
+   a VLAN filtering bridge.
+
+
+[v24.11.0][] - 2024-11-20
+-------------------------
+
+> [!CAUTION]
+> This release contains breaking changes for container users!  As of
+> v24.11.0, all persistent[^1] containers always run in `read-only` mode
+> and the setting itself is deprecated (kept only for compatibility
+> reasons).  The main reason for this change is to better serve users
+> with embedded container images in their builds of Infix.  I.e., they
+> can now upgrade the OCI image in their build and rely on the container
+> being automatically upgraded when Infix is upgraded, issue #823.  For
+> other users, the benefit is that *all* container configuration changes
+> take when activated, issue #822, without having to perform any tricks.
+
+### Changes
+
+ - Add validation of interface name lengths, (1..15), Linux limit
+ - Add support for ftp/http/https URI:s in container image, with a new
+   `checksum` setting for MD5/SHA256/SHA512 verification, issue #801
+ - Add a retry timer to the background container create service.  This
+   will ensure failing `docker pull` operations from remote images are
+   retrying after 60 seconds, or quicker
+ - CLI base component, `klish`, has been updated with better support for
+   raw terminal mode and alternate quotes (' in addition to ")
+ - Log silenced from container activation messages, only the very bare
+   necessities are now logged, e.g., `podman create` command + status
+ - Factory reset no longer calls `shred` to "securely erase" any files
+   from writable data partitions.  This will speed up the next boot
+   considerably
+
+### Fixes
+
+ - Fix #659: paged output in CLI accessed via console port sometimes
+   causes lost lines, e.g. missing interfaces.  With updated `klish`
+   and the terminal in raw mode, the pager (less) can now control both
+   the horizontal and vertical
+ - Fix #822: adding, or changing, an environment variable to a running
+   container does not take without the `container upgrade NAME` trick
+ - Fix #823: with an OCI image embedded in the Infix image, an existing
+   container in the configuration is not upgraded to the new OCI image
+   with the Infix upgrade.
+ - Frr leaves log files in `/var/tmp/frr` on unclean shutdowns.  This
+   has now been fixed with a "tmpfiles" cleanup of that path at boot
+
+[^1]: I.e., set up in the configuration, as opposed to temporary ones
+    started with `container run` from the CLI admin-exec context.
+
+
+[v24.10.2][] - 2024-11-08
 -------------------------

 ### Changes
@@ -22,23 +313,44 @@ All notable changes to the project are documented in this file.
 - Support for saving and restoring system clock from a disk file.  This
  allows restoring the system clock to a sane date in case the RTC is
  disabled or does not have a valid time, issue #794
+- Update device discovery chapter with information on `infix.local` mDNS
+  alias, `netbrowse` support to discover *all* local units, and command
+  examples for disabling LLDP and mDNS services, issue #786
+- Updated OSPF documentation to include information on *global OSPF
+  settings* (`redistribution`, `explicit-router-id`, etc.), issue #812
+- Added information on *forwarding of IEEE reserved group addresses*
+  to bridge section of networking documentation, issue #788
+- Add support for bootstrap conditions and early init product overrides
+- Styx: enable second Ethernet port LED in device tree, again, rename
+  it: yellow -> aux, and make sure it is turned off at boot
+- Styx: disable second port LED for the 4xSFP slots, does not work
+- Styx: override iitod (LED daemon) with a product specific LED script

 ### Fixes
+
 - Fix #685: DSA conduit interface not always detected, randomly causing
  major issues configuring systems with multiple switch cores
 - Fix #778: reactivate OpenSSL backend for libssh/libssh2 for NanoPI R2S.
-  This fixes a regression in v24.10.0 causing loss of NETCONF supprt
+  This fixes a regression in v24.10.0 causing loss of NETCONF support
+- Fix #809: enable syslog logging for RAUC
+- Fix harmless bootstrap log error message on systems without USB ports:
+  `jq: error (at <stdin>:0): Cannot iterate over null (null)`
+- Change confusing `tc` log error message: `Error: does not support
+  hardware offload` to `Skipping $iface, hardware offload not supported.`
+


 [v24.10.1][] - 2024-10-18
 -------------------------

 ### Changes
+
 - Add support for interface description, sometimes referred to as
   "ifAlias".  Saved as an Linux interface alias (not `altname`), e.g.,
   `/sys/class/interfaces/veth0a/ifalias`, includes operational support

 ### Fixes
+
 - Fix #735: `copy` and `erase` commands missing from CLI, regression
   in Infix v24.10.0 defconfigs, now added as dep. in klish package

@@ -53,7 +365,9 @@ Also, heads-up to all downstream users of Infix.  YANG models have been
 renamed to ease maintenance, more info below.

 ### Changes
+
 - Software control of port LEDs on the Styx platform has been disabled.
+
  Default driver behavior, green link and green traffic blink, is kept
  as-is, which should mitigate issues reported in #670
 - Correcting documentation on QoS. For packets containing both a VLAN
@@ -89,6 +403,7 @@ renamed to ease maintenance, more info below.
  see <https://kernelkit.org/posts/firewall-container/>

 ### Fixes
+
 - Fix #499: add an NACM rule to factory-config, which by default deny
  everyone to read user password hash(es)
 - Fix #663: internal Ethernet interfaces shown in CLI tab completion
@@ -100,7 +415,7 @@ renamed to ease maintenance, more info below.
  with `custom-phys-address` to allow for constructing more free-form
  MAC addresses based on the chassis MAC (a.k.a., base MAC) address.
  For more information, see the YANG model, a few examples are listed in
-  the updated documentation.  
+  the updated documentation.
  The syntax will be automatically updated in the `startup-config` and
  `factory-config` -- make sure to verify the changes and update any
  static `factory-config` used for your products
@@ -137,6 +452,7 @@ also been added to facilitate site specific adaptations.  Please see the
 documentation for details.

 ### Known Issues
+
 - The CLI command `show interfaces` may for some terminal resolutions
  not display all interfaces (on systems with >20 interfaces).  This
  problem is limited to the console port and only occurs for smaller
@@ -145,6 +461,7 @@ documentation for details.
  using the CLI from an SSH session, is not affected.  Issue #659

 ### Changes
+
 - Upgrade Buildroot to 2024.02.6 (LTS)
 - Upgrade Linux kernel to 6.6.52 (LTS)
 - Upgrade libyang to 3.4.2
@@ -164,6 +481,7 @@ documentation for details.
  by `mctl` reporting no multicast filtering enabled on bridge

 ### Fixes
+
 - Fix #357: EUI-64 based IPv6 autoconf address on bridges seem to be
  randomized.  Problem caused by kernel setting a random MAC before any
  bridge port is added.  Fixed by using the device's base MAC address on
@@ -226,6 +544,7 @@ Finally, the following consumer boards are now fully supported:
 - StarFive VisionFive2 (RISC-V)

 ### Changes
+
 - Upgrade Buildroot to 2024.02.5 (LTS)
 - Upgrade Linux kernel to 6.6.46 (LTS)
 - Issue #158: enhance security of factory reset.  All file content
@@ -277,6 +596,7 @@ Finally, the following consumer boards are now fully supported:
  log messages.  See `/var/log/debug` for *all* log messages

 ### Fixes
+
 - Fix #274: add missing link/traffic LEDs on NanoPi R2S LAN port
 - Fix #489: ensure all patches are versioned, including Linux kernel
 - Fix #531: creating a new VLAN interface named `vlanN` should not set
@@ -306,6 +626,7 @@ Finally, the following consumer boards are now fully supported:
 > upgrade, but before reboot, a factory reset is required!

 ### Changes
+
 - Upgrade Buildroot to 2024.02.3 (LTS)
 - Upgrade Linux kernel to 6.6.34 (LTS)
 - Upgrade bundled curiOS httpd container to v24.05.0
@@ -372,6 +693,7 @@ Finally, the following consumer boards are now fully supported:
 [yescrypt]: https://en.wikipedia.org/wiki/Yescrypt

 ### Fixes
+
 - Fix #424: regression, root user can log in without password
 - Fix build regressions in `cn9130_crb_boot_defconfig` caused by upgrade
  to Buildroot v2024.02 and recent multi-key support in RAUC and U-Boot
@@ -403,11 +725,13 @@ Finally, the following consumer boards are now fully supported:
 -------------------------

 ### Changes
+
 - Add small delay in U-Boot to allow stopping boot on reference boards
 - Document how to provision the bootloader and Infix on a blank board
 - Use initial hostname from `/etc/os-release` as configuration fallback

 ### Fixes
+
 - Fix build regressions in `cn9130_crb_boot_defconfig` caused by upgrade
  to Buildroot v2024.02 and recent multi-key support in RAUC and U-Boot
 - Fix provisioning script after changes to make GRUB loading more robust
@@ -422,6 +746,7 @@ Finally, the following consumer boards are now fully supported:
 -------------------------

 ### Changes
+
 - Default web landing page refactored into a Buildroot package to make
  it possible to overload from customer repos.
 - Enable DCB support in aarch64 kernel (for EtherType prio override)
@@ -432,6 +757,7 @@ Finally, the following consumer boards are now fully supported:
 - Issue #374: add timestamps to dagger .log files

 ### Fixes
+
 - Add missing LICENSE hash for factory reset tool
 - Fix #424: regression, root user can log in without password

@@ -453,6 +779,7 @@ idea is to generate supported features from the models and include in
 future releases.

 ### Changes
+
 - Bump the base Buildroot version to v2024.02 LTS
 - Bump the base Linux kernel version to 6.6 LTS
 - Drop Classic variant to reduce overhead, simplify build & release
@@ -533,6 +860,7 @@ future releases.
  named 'default'

 ### Fixes
+
 - confd: Fix memory leak when operating on candidate configuration
 - probe: Fix crash on systems without USB
 - Reduced syslog errors for accesses no non-existing xpaths
@@ -1275,7 +1603,17 @@ Supported YANG models in addition to those used by sysrepo and netopeer:
 - N/A

 [buildroot]:  https://buildroot.org/
-[UNRELEASED]: https://github.com/kernelkit/infix/compare/v24.10.1...HEAD
+[UNRELEASED]: https://github.com/kernelkit/infix/compare/v25.06.1...HEAD
+[v25.06.0]:   https://github.com/kernelkit/infix/compare/v25.05.1...v26.06.0
+[v25.05.1]:   https://github.com/kernelkit/infix/compare/v25.05.0...v25.05.1
+[v25.05.0]:   https://github.com/kernelkit/infix/compare/v25.04.0...v25.05.0
+[v25.04.0]:   https://github.com/kernelkit/infix/compare/v25.03.0...v25.04.0
+[v25.03.0]:   https://github.com/kernelkit/infix/compare/v25.02.0...v25.03.0
+[v25.02.0]:   https://github.com/kernelkit/infix/compare/v25.01.0...v25.02.0
+[v25.01.0]:   https://github.com/kernelkit/infix/compare/v24.11.0...v25.01.0
+[v24.11.1]:   https://github.com/kernelkit/infix/compare/v24.11.0...v24.11.1
+[v24.11.0]:   https://github.com/kernelkit/infix/compare/v24.10.0...v24.11.0
+[v24.10.2]:   https://github.com/kernelkit/infix/compare/v24.10.1...v24.10.2
 [v24.10.1]:   https://github.com/kernelkit/infix/compare/v24.10.0...v24.10.1
 [v24.10.0]:   https://github.com/kernelkit/infix/compare/v24.09.0...v24.10.0
 [v24.09.0]:   https://github.com/kernelkit/infix/compare/v24.08.0...v24.09.0
@@ -1,13 +1,16 @@
+<img align="right" src="logo.png" alt="Infix - Linux <3 NETCONF" width=480 border=10>

-Welcome to Infix, your friendly Network Operating System!  On these
-pages you can find both user and developer documentation.
+Welcome to Infix, your immutable, friendly, and secure operating system!
+On these pages you can find both user and developer documentation.

-> Topics on configuring the system include CLI examples, every setting
-> is also possible to perform using NETCONF.  In fact, the Infix test
-> system solely relies on NETCONF for configuring network topologies.
+Most topics on configuring the system include CLI examples, but every
+setting, as well as status read-back from the operational datastore, is
+also possible to perform using NETCONF or RESTCONF.  In fact, the Infix
+regression test system solely relies on NETCONF and RESTCONF.

-The CLI documentation is also available from inside the CLI itself using
-the `help` command.
+> [!TIP]
+> The CLI documentation is also available from inside the CLI itself
+> using the `help` command in admin-exec mode.

 - **CLI Topics**
   - [Introduction to the CLI](cli/introduction.md)
@@ -18,6 +21,7 @@ the `help` command.
   - [Introduction](introduction.md)
   - [System Configuration](system.md)
   - [Network Configuration](networking.md)
+   - [DHCP Server](dhcp.md)
   - [Syslog Support](syslog.md)
 - **Infix In-Depth**
   - [Boot Procedure](boot.md)
@@ -63,7 +63,7 @@ bootloader's validation procedure, user configuration is kept to a
 minimum.  Two settings are available:

 - **Boot order**: Since Infix maintains two copies of its software image,
-  and as some bootloaders support netbooting, the order in which boot
+  and as some bootloaders support [netbooting][2], the order in which boot
  sources are considered can be configured. To select the active
  source, use [RAUC][]:

@@ -349,5 +349,8 @@ can funtion reasonably well without a persistent `/var`, loosing
 If `var` is not available, Infix will still persist `/var/lib` using
 `cfg` as the backing storage.

-[^1]: See [CLI Upgrade](cli/upgrade.md) for information on upgrading
-    via CLI.
+[^1]: See [Upgrading procedures and boot
+    order](system.md#upgrade-procedures-and-boot-order) for
+    information on upgrading via CLI.
+
+[2]: netboot.md
@@ -60,14 +60,14 @@ rootfs overlay -- with a [VPD](vpd.md) you can even support several!
 ### Variables & Format Specifiers

 Parts of the configuration you likely always want to generated, like the
-SSH hostkey used by NETCONF, a unique hostname, or the `admin` user's
+SSH hostkey used by SSH server and NETCONF, a unique hostname, or the `admin` user's
 unique (per-device with a VPD) password hash.  This section lists the
 available keywords, see the next section for examples of how to use
 them:

 - **Default password hash:** `$factory$` (from VPD, .dtb, or built-in)  
   XPath: `/ietf-system:system/authentication/user/password`
- - **Default NETCONF hostkey:** `genkey` (regenerated at factory reset)  
+ - **Default SSH and NETCONF hostkey:** `genkey` (regenerated at factory reset)
   XPath: `/ietf-keystore:keystore/asymmetric-keys/asymmetric-key[name='genkey']`
 - **Hostname format specifiers:**  
   XPath: `/ietf-system:system/hostname`
@@ -214,15 +214,15 @@ text file without line breaks (`-w0`):
 ```bash
 $ echo "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCAtLSBhIE5ldHdvcmsgT3BlcmF0aW5nIFN5c3RlbQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQuZ2l0aHViLmlvCictJy0tLSctJwo=" |base64 -d
 .-------.
-|  . .  | Infix -- a Network Operating System
+|  . .  | Infix OS — Immutable.Friendly.Secure
 |-. v .-| https://kernelkit.github.io
 '-'---'-'
 ```

 **IETF Keystore**

-Notice how both the public and private keys are left empty here.  The
-`genkey` is always automatically regenerated after each factory reset.
+Notice how both the public and private keys are left empty here, this
+cause them to be always automatically regenerated after each factory reset.
 Keeping the `factory-config` snippet like this means we can use the same
 file on multiple devices, without risking them sharing the same host
 keys.  Sometimes you may want the same host keys, but that is the easy
@@ -245,8 +245,6 @@ use-case and not documented here.
  },
 ```

-The `genkey` is currently only used by the NETCONF SSH backend.
-
 **IETF NETCONF Server**

 ```json
@@ -280,6 +278,28 @@ The `genkey` is currently only used by the NETCONF SSH backend.
  },
 ```

+**Infix Services**
+```json
+  "infix-services:ssh": {
+    "enabled": true,
+    "hostkey": [
+      "genkey"
+    ],
+    "listen": [
+      {
+        "name": "ipv4",
+        "address": "0.0.0.0",
+        "port": 22
+      },
+      {
+        "name": "ipv6",
+        "address": "::1",
+        "port": 22
+      }
+    ]
+  }
+```
+


 Integration
@@ -370,22 +390,30 @@ But you can of course use only two numbers, *major.minor*, as well.
 > with your own versioning scheme.


-### `INFIX_RELEASE`
+### Specifying Versioning Information

-This global variable **must be** a lower-case string (no spaces or
-other characters outside of 0–9, a–z, '.', '_' and '-') identifying
-the operating system version, excluding any OS name information or
-release code name, and suitable for processing by scripts or usage
-in generated filenames.
+Two optional environment variables control the version information
+recorded in images. Both of these **must be** a lower-case string (no
+spaces or other characters outside of 0–9, a–z, '.', '_' and '-')
+identifying the operating system version, excluding any OS name
+information or release code name, and suitable for processing by
+scripts or usage in generated filenames.
+
+#### `INFIX_BUILD_ID`
+
+Used for `BUILD_ID` in `/etc/os-release`.
+
+**Default:** `$(git describe --always --dirty --tags)`, from the _top
+directory_. By default, the top directory refers to the root of the
+Infix source tree, but this can be changed by setting the branding
+variable `INFIX_OEM_PATH`, e.g. in a `defconfig` file or via `make
+menuconfig`, to the path of an enclosing br2-external.
+
+#### `INFIX_RELEASE`

 Used for `VERSION` and `VERSION_ID` in `/etc/os-release` and
 generated file names like disk images, etc.

-**Default:** generated using `git describe --always --dirty --tags`,
-with an additional `-C $infix_path`.  This variable defaults to the
-Infix tree and can be changed by setting the menuconfig branding
-variable `INFIX_OEM_PATH` to that of the br2-external.  It is also
-possible to set the `GIT_VERSION` variable in your `post-build.sh`
-script to change how the VCS version is extracted.
+**Default:** `${INFIX_BUILD_ID}`

 [NanoPi R2S]: https://github.com/kernelkit/infix/blob/main/board/aarch64/r2s/rootfs/etc/factory-config.cfg
@@ -39,7 +39,12 @@ The secondary partition (`rootfs.1`) has now been upgraded and will be used as
 the *active* partition on the next boot.  Leaving the primary partition, with
 the version we are currently running, intact in case of trouble.

+See [upgrading procedures and boot order][2] for more information on
+    upgrading.
+
 [^1]: It is not possible to upgrade the partition we booted from.  Thankfully
    the underlying "rauc" subsystem keeps track of this.  Hence, to upgrade
    both partitions you must reboot to the new version (to verify it works)
    and then repeat the same command.
+
+[2]: ../system.md#upgrade-procedures-and-boot-order
@@ -20,6 +20,9 @@ Containers in Infix
  * [Application Container: ntpd](#application-container-ntpd)
 * [Advanced](#advanced)
  * [Running Host Commands From Container](#running-host-commands-from-container)
+* [Container Requirements](#container-requirements)
+  * [Advanced Users](#advanced-users)
+

 Introduction
 ------------
@@ -28,18 +31,19 @@ Infix comes with native support for Docker containers using [podman][].
 The [YANG model][1] describes the current level of support, complete
 enough to run both system and application containers.

-Key design features, like using Linux switchdev, allow users to assign
-switch ports directly to containers, not just bridged VETH pairs, this
-is a rare and in many cases *unique* feature of Infix.
+Key design features of Infix, like using Linux switchdev, allow users to
+assign switch ports directly to containers, not just bridged VETH pairs.
+This is a rare and in many cases *unique* feature of Infix.

 All network specific settings are done using the IETF interfaces YANG
 model, with augments for containers to ensure smooth integration with
 container networking in podman.

-> **Note:** even though the `podman` command can be used directly from a
-> shell prompt, we strongly recommend using the CLI commands instead.
-> They employ the services of a wrapper `container` script which handles
-> the integration of containers in the system.
+> [!IMPORTANT]
+> Even though the `podman` command can be used directly from a shell
+> prompt, we strongly recommend using the CLI commands instead.  They
+> employ the services of a wrapper `container` script which handles the
+> integration of Docker containers in the system.


 Caution
@@ -79,30 +83,32 @@ In the CLI, containers can be run in one of two ways:
 1. `container run IMAGE [COMMAND]`, or
 2. enter `configure` context, then `edit container NAME`

-The former is useful mostly for testing, or running single commands in
-an image.  It is a wrapper for `podman run -it --rm ...`, while the
-latter is a wrapper and adaptation of `podman create ...`.
+The first is useful mostly for testing, or running single commands in
+an image.  It is a wrapper for `podman run -it --rm ...`.

-The second create a container with a semi-persistent writable layer that
-survives container restarts and host system restarts.  However, if you
-change the container configuration or upgrade the image (see below), the
-container will be recreated and the writable layer is lost.  This is why
-it is recommended to set up a named volume for directories, or use file
-[Content Mounts](#content-mounts), in your container if you want truly
-persistent content.
+The second creates a read-only container that by default automatically
+start at every boot.   It basically wraps `podman create ...`.

-In fact, in many cases the best way is to create a `read-only` container
-and use file mounts and volumes only for the critical parts.  Podman
-ensures (using tmpfs) `read-only` containers still have writable
-directories for certain critical file system paths: `/dev`, `/dev/shm`,
-`/run`, `/tmp`, and `/var/tmp`.  Meaning, what you most often need is
-writable volumes for `/var/lib` and `/etc`, or only file mounts for a
-few files in `/etc`.  The actual needs depend on the container image and
-application to run.
+When non-volatile storage is needed two complementary options exist:

-> **Note:** when running containers from public registries, double-check
-> that they support the CPU architecture of your host system.  Remember,
-> unlike virtualization, containers reuse the host's CPU and kernel.
+ - **Volumes:** data stored in a volume is persisted until explicitly
+   removed from the configuration, i.e., across host reboots and
+   container upgrades
+ - **[Content Mounts](#content-mounts):** where the content of a file
+  mounted into the container is kept along with the container
+  configuration in the device's `startup-config`
+
+Podman ensures (using tmpfs) all containers have writable directories
+for certain critical file system paths: `/dev`, `/dev/shm`, `/run`,
+`/tmp`, and `/var/tmp`.  Meaning, what you most often need is writable
+volumes for `/var/lib` and `/etc`, or only file mounts for a few files
+in `/etc`.  The [actual requirements](#container-requirements) depend on
+your container image and application to run.
+
+> [!IMPORTANT]
+> When running containers from public registries, double-check that they
+> support the CPU architecture of your host system.  Remember, unlike
+> virtualization, containers reuse the host's CPU and kernel.


 <img align="right" src="img/docker-hello-world.svg" alt="Hello World" width=360>
@@ -123,24 +129,30 @@ Classic Hello World:
    Hello from Docker!
    This message shows that your installation appears to be working correctly.

-Persistent web server using nginx, sharing the host's network:
+A web server with [nginx][], using standard docker bridge.  Podman will
+automatically create a VETH pair for us, connecting the container to the
+`docker0` bridge:

    admin@example:/> configure
-    admin@example:/config> edit container web
-    admin@example:/config/container/web> set image docker://nginx:alpine
-    admin@example:/config/container/web> set publish 80:80
-    admin@example:/config/container/web> set network host
-    admin@example:/config/container/web> leave
+    admin@example:/config/> edit interface docker0
+    admin@example:/config/interface/docker0/> set container-network
+    admin@example:/config/interface/docker0/> end
+    admin@example:/config/> edit container web
+    admin@example:/config/container/web/> set image docker://nginx:alpine
+    admin@example:/config/container/web/> set network publish 8080:80
+    admin@example:/config/container/web/> set network interface docker0
+    admin@example:/config/container/web/> set volume cache target /var/cache
+    admin@example:/config/container/web/> leave
    admin@example:/> show container

 Exit to the shell and verify the service with curl, or try to attach
 to your device's IP address using your browser:

-    admin@example:~$ curl http://localhost
+    admin@example:~$ curl http://localhost:8080

-or connect to port 80 of your running Infix system with a browser.  See
-the following sections for how to add more interfaces and manage your
-container at runtime.
+or connect to port 8080 of your running Infix system with a browser.
+See the following sections for how to add more interfaces and manage
+your container at runtime.


 Container Images
@@ -168,13 +180,20 @@ The CLI help shows:
        oci-archive:/lib/oci/archive -- Use archive:latest from OCI archive
                                        May be in .tar or .tar.gz format

+        Additionally, the following URIs are also supported for setups
+        that do not use a HUB or similar.  Recommend using 'checksum'!
+
+        ftp://addr/path/to/archive   -- Downloaded using wget
+        http://addr/path/to/archive  -- Downloaded using curl
+        https://addr/path/to/archive -- Downloaded using curl
+
        Note: if a remote repository cannot be reached, the creation of the
              container will be put on a queue that retries pull every time
              there is a route change in the host's system.

-> **Note::** the built-in help system in the CLI is generated from the
-> YANG model, so the same information is also available for remote
-> NETCONF users.
+> [!TIP]
+> The built-in help system in the CLI is generated from the YANG model,
+> so the same information is also available for remote NETCONF users.

 The two most common variants are `docker://` and `oci-archive:/`.

@@ -217,21 +236,46 @@ mind.
    -rw-r--r--    1 root     root       7261785 Mar 27 14:22 curios-oci-amd64.tar.gz
    drwx------    6 frr      frr           4096 Mar 27 11:57 frr/

-Importing the image into podman can be done either from the CLI
+Importing the image into Podman can be done either from the CLI
 admin-exec context ...

    admin@example:/var/tmp$ cli
    admin@example:/> container load /var/tmp/curios-oci-amd64.tar.gz name curios:edge

-> The `name curios:edge` is the tag you give the imported
-> (raw) archive which you can then reference in your container image
-> configuration: `set image curios:edge`.
+> [!TIP]
+> The `name curios:edge` is the tag you give the imported (raw) archive
+> which you can then reference in your container image configuration:
+> `set image curios:edge`.

 ... or by giving the container configuration the full path to the OCI
 archive, which helps greatly with container upgrades (see below):

    admin@example:/config/container/system/> set image oci-archive:/var/tmp/curios-oci-amd64.tar.gz

+**Checksum Example:**
+
+    admin@example:/> configure
+    admin@example:/config/> edit container sys
+    admin@example:/config/container/sys/> set hostname sys
+    admin@example:/config/container/sys/> set image ftp://192.168.122.1/curios-oci-amd64-v24.05.0.tar.gz
+    admin@example:/config/container/sys/> set checksum
+        md5 sha256 sha512
+    admin@example:/config/container/sys/> set checksum sha256 4f01077036527498ed910f1a3e80645ae3eff629d10043cf80ebc6850c99c629
+    admin@example:/config/container/sys/> leave
+    admin@example:/> copy running-config startup-config
+    admin@example:/> show container
+    CONTAINER ID  IMAGE                                             COMMAND               CREATED         STATUS        PORTS       NAMES
+    b02e945c43c9  localhost/curios-oci-amd64-v24.05.0:latest                              5 seconds ago   Up 5 seconds              sys
+
+    admin@example:/> show log
+    ...
+    Nov 20 07:24:56 infix container[5040]: Fetching ftp://192.168.122.1/curios-oci-amd64-v24.05.0.tar.gz
+    Nov 20 07:24:56 infix container[5040]: curios-oci-amd64-v24.05.0.tar.gz downloaded successfully.
+    Nov 20 07:24:56 infix container[5040]: curios-oci-amd64-v24.05.0.tar.gz checksum verified OK.
+    Nov 20 07:24:57 infix container[5040]: Cleaning up extracted curios-oci-amd64-v24.05.0
+    Nov 20 07:24:57 infix container[5040]: podman create --name sys --conmon-pidfile=/run/container:sys.pid --read-only --replace --quiet --cgroup-parent=containers  --restart=always --systemd=false --tz=local --hostname sys --log-driver k8s-file --log-opt path=/run/containers/sys.fifo --network=none curios-oci-amd64-v24.05.0
+    Nov 20 07:24:57 infix container[3556]: b02e945c43c9bce2c4be88e31d6f63cfdb1a3c8bdd02179376eb059a49ae05e4
+

 Upgrading a Container Image
 ---------------------------
@@ -240,21 +284,24 @@ Upgrading a Container Image
 The applications in your container are an active part of the system as a
 whole, so make it a routine to keep your container images up-to-date!

-> **Note:** the default writable layer is lost when upgrading the image.
-> Use named volumes for content that you want to persist across upgrades.
+Containers are created at first setup and at every boot.  If the image
+exists in the file system it is reused -- i.e., an image pulled from a
+remote registry is not fetched again.

-All container configurations are locked to the image hash at the time of
-first download, not just ones that use an `:edge` or `:latest` tag.  An
-upgrade of containers using versioned images is more obvious -- update
-the configuration to use the new `image:tag` -- the latter is a bit
-trickier.  Either remove the configuration and recreate it (leave/apply
-the changes between), or use the admin-exec level command:
+To upgrade a versioned image:
+ - update your `running-config` to use the new `image:tag`
+ - `leave` to activate the change, if you are in the CLI
+ - Podman pulls the new image in the background
+ - Your container is recreated with the new image
+ - The container is started
+
+For "unversioned" images, e.g., images using a `:latest` or `:edge` tag,
+use the following CLI command (`NAME` is the name of your container):

    admin@example:/> container upgrade NAME

-Where `NAME` is the name of your container.  This command stops the
-container, does `container pull IMAGE`, and then recreates it with the
-new image.  Upgraded containers are automatically restarted.
+This stops the container, does `container pull IMAGE`, and recreates it
+with the new image.  Upgraded containers are automatically restarted.

 **Example using registry:**

@@ -279,12 +326,30 @@ the upgrade command as
 	Upgrading container system with local archive: oci-archive:/var/tmp/curios-oci-amd64.tar.gz ...
 	7ab4a07ee0c6039837419b7afda4da1527a70f0c60c0f0ac21cafee05ba24b52

+OCI archives can also be fetched from ftp/http/https URL, in that case
+the upgrade can be done the same way as a registry image (above).
+
+> [!TIP]
+> Containers running from OCI images embedded in the operating system,
+> e.g., `/lib/oci/mycontainer.tar.gz`, always run from the version in
+> the operating system.  To upgrade, install the new container image at
+> build time, after system upgrade the container is also upgraded.  The
+> system unpacks and loads the OCI images into Podman every boot, which
+> ensures the running container always has known starting state.
+>
+> **Example:** default builds of Infix include a couple of OCI images
+> for reference, one is `/lib/oci/curios-nftables-v24.11.0.tar.gz`, but
+> there is also a symlink called `curios-nftables-latest.tar.gz` in the
+> same directory, which is what the Infix regression tests use in the
+> image configuration of the container.  This is what enables easy
+> upgrades of the container along with the system itself.
+

 Capabilities
 -------------

 An unprivileged container works for almost all use-cases, but there are
-occasions where they are too restricted and users being looking for the
+occasions where they are too restricted and users start looking for the
 `privileged` flag.  Capabilities offers a middle ground.

 For example, a system container from which `ping` does not work:
@@ -300,9 +365,9 @@ For example, a system container from which `ping` does not work:
 	...

 Infix supports a subset of all [capabilities][6] that are relevant for
-containers.  Please note, that this is and advanced topic and will
-require time and analysis of your container application to figure out
-which capabilities you need.
+containers.  Please note, that this is an advanced topic that require
+time and analysis of your container application to figure out which
+capabilities you need.


 Networking and Containers
@@ -312,9 +377,16 @@ By default, unlike other systems, persistent[^1] containers have no
 networking enabled.  All network access has to be set up explicitly.
 Currently two types of of container networks are supported:

- - `host`: one end of a VETH pair, or a physical Ethernet port
+ - `host`: an managed host interface, e.g., one end of a VETH pair,
+   or even a physical interface
 - `bridge`: an IP masquerading bridge

+In the former the interface is delegated to (moved into) the container,
+while in the latter a VETH pair is automatically created by Podman and
+one end delegated to the container, while the other end is assigned to
+the bridge (see the next section).
+
+> [!TIP]
 > For more information on VETH pairs, see the [Networking Guide][0].


@@ -347,10 +419,12 @@ have to set manually:
    admin@example:/config/interface/docker0/> set type bridge
    admin@example:/config/interface/docker0/> set container-network type bridge

-> **Note:** when doing the same operation over NETCONF there is no
-> inference, so all the "magic" settings need to be defined.  This
-> makes the CLI very useful for first setup and then extracting the
-> resulting XML from the shell using the `cfg -X` command.
+> [!IMPORTANT]
+> When configuring the system via an API such as NETCONF or RESTCONF, no
+> settings are inferred.  Instead it is up to the caller to fully define
+> the desired setup.  This makes the CLI very useful for first setup and
+> then extracting the resulting XML from the shell using the `cfg -X`
+> command.

 We have to declare the interface as a container network, ensuring the
 interface cannot be used by the system for any other purpose.  E.g., a
@@ -390,11 +464,11 @@ in a `bridge`.  Below an example of a system container calls `set
 network interface docker0`, here we show how to set options for that
 network:

-    admin@example:/config/container/ntpd/> edit network docker0 
-    admin@example:/config/container/ntpd/network/docker0/> 
-    admin@example:/config/container/ntpd/network/docker0/> set option 
+    admin@example:/config/container/ntpd/> edit network interface docker0
+    admin@example:/config/container/ntpd/network/interface/docker0/>
+    admin@example:/config/container/ntpd/network/interface/docker0/> set option
    <string>  Options for masquerading container bridges.
-    admin@example:/config/container/ntpd/network/docker0/> help option 
+    admin@example:/config/container/ntpd/network/interface/docker0/> help option
    NAME
            option <string>
    
@@ -405,9 +479,9 @@ network:
                     mac=00:01:02:c0:ff:ee -- set fixed MAC address in container
                     interface_name=foo0   -- set interface name inside container
    
-    admin@example:/config/container/ntpd/network/docker0/> set option ip=172.17.0.2
-    admin@example:/config/container/ntpd/network/docker0/> set option interface_name=wan
-    admin@example:/config/container/ntpd/network/docker0/> leave
+    admin@example:/config/container/ntpd/network/interface/docker0/> set option ip=172.17.0.2
+    admin@example:/config/container/ntpd/network/interface/docker0/> set option interface_name=wan
+    admin@example:/config/container/ntpd/network/interface/docker0/> leave


 ### Container Host Interface
@@ -419,8 +493,12 @@ example.

 The network `option` setting is available also for this case, but only
 the `interface_name=foo0` option works.  Which is still very useful.  To
-change the MAC address, you need to use the `custom-phys-address` in the
-general network settings.
+set:
+
+ - IP address, use IPv4/IPv6 settings in the interface settings
+ - MAC address, to use the `custom-phys-address` in the interface settings
+
+For an example of both, see the next section.

 [^3]: Something which the container bridge network type does behind the
    scenes with one end of an automatically created VETH pair.
@@ -447,6 +525,7 @@ line where we declare the `ntpd` end as a container network interface:
    admin@example:/config/interface/ntpd/> set custom-phys-address static 00:c0:ff:ee:00:01
    admin@example:/config/interface/ntpd/> set container-network

+> [!TIP]
 > Notice how you can also set a custom MAC address at the same time.

 Adding the interface to the container is the same as before, but since
@@ -456,6 +535,7 @@ can take a bit of a shortcut.
    admin@example:/config/container/ntpd/> set network interface ntpd
    admin@example:/config/container/ntpd/> leave

+> [!TIP]
 > Use the `set network interface ntpd option interface_name=foo0` to set
 > the name of the interface inside the container to `foo0`.

@@ -478,6 +558,7 @@ We start by adding the second VETH pair:
    admin@example:/config/interface/veth1a/> set veth peer veth1
    admin@example:/config/interface/veth1a/> set ipv4 address 192.168.1.2 prefix-length 24

+> [!NOTE]
 > The LAN bridge (br1) in this example has IP address 192.168.1.1.

 When a container has multiple host interfaces it can often be useful to
@@ -529,29 +610,40 @@ file system:
    admin@example:/config/container/system/mount/leds> end
    admin@example:/config/container/system/>

-Sometimes *volumes* are a better fit.  A volume is an automatically
+Any type of file can be *bind mounted* into the container, just watch
+out for permissions though.  In the example above, `/sys/class/leds` is
+not writable from a container unless it runs in *privileged* mode.  For
+plain configuration files you get more freedom, and your container can
+rely on, e.g., *inotify* events to trigger reloading its services when
+you change the file on the host.
+
+So it depends on the container, and indeed your overall setup, what to
+use.  An intriguing option is *Content Mounts*, which when changed also
+trigger a container restart.
+
+Other times *volumes* are a better fit.  A volume is an automatically
 created read-writable entity that follows the life of your container.

    admin@example:/config/container/ntpd/> set volume varlib target /var/lib

-Volumes survive reboots and upgrading of the base image, unlike the
-persistent writable layer you get by default, which does not survive
-upgrades.  The volume is created by podman when the container first
-starts up, unlike a regular bind mount it synchronizes with the contents
-of the underlying container image's path on the first start.  I.e.,
-"bind-mount, if empty: then rsync".
+Volumes are persistent across both reboots and upgrades of the base
+image.  They are created by Podman when the container first starts up,
+unlike a regular bind mount it synchronizes with the contents of the
+underlying container image's path at first use.  I.e., "bind-mount, if
+empty: then rsync".

+> [!NOTE]
 > Infix support named volumes (only), and it is not possible to share a
 > volume between containers.  All the tricks possible with volumes may
 > be added in a later release.

 ### Content Mounts

-Content mount is a special type of where the file contents for the
-container is stored alongside the container configuration.  This can be
-very useful when deploying similar systems at multiple sites.  When the
-host loads its `startup-config` (or even `factory-config`) a temporary
-file is created using the decoded base64 data from the `content` node.
+Content mounts are a special type of file mount where the file contents
+is stored with the container configuration.  This can be very useful
+when deploying similar systems at multiple sites.  When the host loads
+its `startup-config` (or even `factory-config`) a temporary file is
+created using the decoded base64 data from the `content` node.

    admin@example:/config/container/ntpd/> edit mount ntpd.conf
    admin@example:/config/container/ntpd/mount/ntpd.conf> text-editor content
@@ -564,9 +656,10 @@ The editor is a small [Emacs clone called Mg][2], see the built-in help
 text, or press Ctrl-x Ctrl-c to exit and save.  When the editor exits
 the contents are base64 encoded and stored in the candidate datastore.

-> **Note:** since these files are always recreated when the host is
-> restarted, changes made by the container are not preserved, or saved
-> back to the host's startup-config even if the read-only option is off.
+> [!NOTE]
+> Since these files are always recreated when the host is restarted,
+> changes made by the container are not preserved, or saved back to the
+> host's startup-config.

 Infix has three different text editors available.  For more information,
 see [CLI Text Editor](cli/text-editor.md).
@@ -588,10 +681,11 @@ we created previously:
    admin@example:/config/container/system/> set publish 222:22
    admin@example:/config/container/system/> leave

-> **Note:** ensure you have a network connection to the registry.
-> If the image cannot be pulled, creation of the container will be
-> put in a queue and be retried every time there is a change in the
-> routing table, e.g., default route is added.
+> [!NOTE]
+> Ensure you have a network connection to the registry.  If the image
+> cannot be pulled, creation of the container will be put in a queue and
+> be retried every time there is a change in the routing table, e.g.,
+> default route is added, and every 60 seconds.

 Provided the image is downloaded successfully, a new `system` container
 now runs behind the docker0 interface, forwarding container port 22 to
@@ -707,12 +801,13 @@ Another *insecure* approach is to access the host system directly,
 bypassing the namespaces that make up the boundary between host and
 container.

-> **Security:** Please note, this completely demolishes the isolation
-> barrier between container and host operating system.  It is only
-> suitable in situations where the container serves more as a unit of
-> distribution rather than as a separate component of the system.
-> *Strongly recommended* to use this only in trusted setups!  Consider
-> also limiting the time frame in which this is active!
+> [!CAUTION]
+> Please note, this completely demolishes the isolation barrier between
+> container and host operating system.  It is only suitable in
+> situations where the container serves more as a unit of distribution
+> rather than as a separate component of the system.  *Strongly
+> recommended* to use this only in trusted setups!  Consider also
+> limiting the time frame in which this is active!

 First, enable *Privileged* mode, this unlocks the door and allows the
 container to manage resources on the host system.  An example is the
@@ -747,6 +842,58 @@ control an Infix system this way, see [Scripting Infix](scripting.md).
 	it may not be enabled by default in BusyBox.


+Container Requirements
+----------------------
+
+In addition to general [*best practices*][7] for container images, there
+are a few more things to consider when targeting embedded systems:
+
+ - Ensure the image targets the CPU architecture of the target system,  
+   learn more about [Multi-platform Builds][8]
+ - Follow [best practices for naming and tagging][10], e.g., `:latest` vs `:1.0`
+ - Follow [OCI recommendations and layout][9],  
+   learn more about [OCI and Docker Exporters][6]
+
+If the [Docker documentation][11] is not enough, there are plenty of
+[guides online][12] with examples on how to create your own container
+image.  For the more advanced, please see the next section.
+
+
+### Advanced Users
+
+Most people prefer their system containers small, often based on Alpine
+Linux, or similar, with only a few small applications, including their
+own, and an SSH server perhaps.  For some developers, even this is too
+big, so they roll their own from source.  This section is for you.
+
+Depending on your needs, here is a checklist:
+
+ - you need something that can forward signals, e.g.,
+   - [tini][]
+   - [Bash only][13], or
+   - BusyBox init, a classic most embedded developers know, but read on ...
+ - a system container only need the bare necessities of a system bringup
+   - E.g., BusyBox's init, [but not everything][15]
+   - Some of the networking is set up by Podman and CNI for you, but
+     you may want to run a DHCP client?
+   - Do *not* rename interfaces inside the container, use the dedicated
+     `interface_name` option in the configuration instead
+   - Remember, Podman provides a `tmpfs` for all critical system paths:
+     `/dev`, `/dev/shm`, `/run`, `/tmp`, and `/var/tmp`, so you don't
+     need to clean or set up any of these mount points
+
+Examples using `tini` and BusyBox init are available from the KernelKit
+[curiOS project][14].  It is a small Buildroot based container image
+builder that generates OCI compatible image tarballs without any tools
+from Docker or Podman -- ready-made images exist for testing on both
+AMD64 and ARM64 targets, as well as `docker pull` images and and OCI
+tarballs with SHA256 checksums for integrity checking.
+
+Finally, if you build your own version of Infix, and embed OCI tarballs
+in the system image, then see the tip at the end of [Upgrading a
+Container Image](#upgrading-a-container-image) (above).
+
+
 [0]:      networking.md
 [1]:      https://github.com/kernelkit/infix/blob/main/src/confd/yang/infix-containers.yang
 [2]:      https://github.com/troglobit/mg
@@ -754,4 +901,15 @@ control an Infix system this way, see [Scripting Infix](scripting.md).
 [4]:      system.md#ssh-authorized-key
 [5]:      https://docs.docker.com/build/exporters/oci-docker/
 [6]:      https://man7.org/linux/man-pages/man7/capabilities.7.html
+[7]:      https://docs.docker.com/build/building/best-practices/
+[8]:      https://docs.docker.com/build/building/multi-platform/
+[9]:      https://github.com/opencontainers/image-spec/blob/main/image-layout.md
+[10]:     https://docs.docker.com/get-started/docker-concepts/building-images/build-tag-and-publish-an-image/#tagging-images
+[11]:     https://www.docker.com/blog/multi-arch-images/
+[12]:     https://lemariva.com/blog/2018/05/tutorial-docker-on-embedded-systems-raspberry-pi-beagleboard
+[13]:     https://sirikon.me/posts/0009-pid-1-bash-script-docker-container.html
+[14]:     https://github.com/kernelkit/curiOS/
+[15]:     https://github.com/kernelkit/curiOS/blob/2e4748f65e356b2c117f586cd9420d7ba66f79d5/board/system/rootfs/etc/inittab
+[tini]:   https://github.com/krallin/tini
+[nginx]:  https://hub.docker.com/_/nginx
 [podman]: https://podman.io
@@ -67,7 +67,8 @@ $ sudo apt install bc binutils build-essential bzip2 cpio \
                   diffutils file findutils git gzip      \
                   libncurses-dev libssl-dev perl patch   \
                   python3 rsync sed tar unzip wget       \
-                   autopoint bison flex autoconf automake
+                   autopoint bison flex autoconf automake \
+                   mtools
 ```

 > For details, see the Getting Started and System Requirements sections
@@ -131,6 +132,8 @@ This rebuilds (and installs) `foo` and `bar`, the `all` target calls
 on Buildroot to finalize the target filesystem and generate the images.
 The final `run` argument is explained below.

+
+
 ### `confd`

 The Infix `src/confd/` is the engine of the system.  Currently it is a
@@ -164,17 +167,239 @@ Now you can rebuild `confd`, just as described above, and restart Infix:
    make confd-rebuild all run


+### `statd`
+
+The Infix status daemon, `src/statd`, is responsible for populating the
+sysrepo `operational` datastore. Like `confd`, it uses XPath subscriptions,
+but unlike `confd`, it relies entirely on `yanger`, a Python script that
+gathers data from local linux services and feeds it into sysrepo.
+
+To apply changes, rebuild the image:
+
+    make python-statd-rebuild statd-rebuild all
+
+Rebuilding the image and testing on target for every change during
+development process can be tedious. Instead, `yanger` allows remote
+execution, running the script directly on the host system (test
+container):
+
+    infamy0:test # ../src/statd/python/yanger/yanger -x "../utils/ixll -A ssh d3a" ieee802-dot1ab-lldp
+
+`ixll` is a utility script that lets you run network commands using an
+**interface name** instead of a hostname. It makes operations like
+`ssh`, `scp`, and network discovery easier.
+
+Normally, `yanger` runs commands **locally** to retrieve data
+(e.g., `lldpcli` when handling `ieee802-dot1ab-lldp`). However, when
+executed with `-x "../utils/ixll -A ssh d3a"` it redirects these
+commands to a remote system connected to the local `d3a` interface via
+SSH. This setup is used for running `yanger` in an
+[interactive test environment](testing.md#interactive-usage). The yanger
+script runs on the `host` system, but key commands are executed on the
+`target` system.
+
+For debugging or testing, you can capture system command output and
+replay it later without needing a live system.
+
+To capture:
+
+    infamy0:test # ../src/statd/python/yanger/yanger -c /tmp/capture ieee802-dot1ab-lldp
+
+To replay:
+
+    infamy0:test # ../src/statd/python/yanger/yanger -r /tmp/capture ieee802-dot1ab-lldp
+
+This is especially useful when working in isolated environments or debugging
+issues without direct access to the DUT.
+
+### Upgrading Packages
+
+#### Buildroot
+
+Kernelkit maintains an internal [fork of
+Buildroot](https://github.com/kernelkit/buildroot), with branches
+following the naming scheme `YYYY.MM.patch-kkit`
+e.g. `2025.02.1-kkit`, which means a new branch should be created
+whenever Buildroot is updated. These branches should contain **only**
+changes to existing packages (but no new patches), modifications to
+Buildroot itself or upstream backports.
+
+KernelKit track the latest Buildroot LTS (Long-Term Support) release
+and updates. The upgrade of LTS minor releases is expected to have low
+impact and should be done as soon there is a patch release of
+Buildroot LTS is available.
+
+> **Depending on your setup, follow the appropriate steps below.**
+
+🔁 If you **already have** the Buildroot repo locally
+
+1. Navigate to the Buildroot directory
+   ```bash
+    $ cd buildroot
+   ```
+2. Pull the latest changes from KernelKit
+   ```bash
+   $ git pull
+   ```
+3. Fetch the latest tags from upstream
+   ```bash
+   $ git fetch upstream --tags
+   ```
+
+
+🆕 If you don't have the repo locally
+
+1. Clone the Kernelkit Buildroot repository
+   ```bash
+   $ git clone git@github.com:kernelkit/buildroot.git
+   ```
+
+2. Add the upstream remote
+   ```bash
+   $ git remote add upstream https://gitlab.com/buildroot.org/buildroot.git
+   ```
+3. Checkout old KernelKit branch
+   ```bash
+   $ git checkout 2025.02.1-kkit
+   ```
+
+
+🛠  Continue from here (applies to both cases):
+
+4. Create a new branch based on the **previous** KernelKit Buildroot
+   release (e.g.  `2025.02.1-kkit`) and name it according to the naming scheme (e.g. `2025.02.2-kkit`)
+   ```bash
+   $ git checkout -b 2025.02.2-kkit
+   ```
+5. Rebase the new branch onto the corresponding upstream release
+   ```bash
+   $ git rebase 2025.02.2
+   ```
+> [!NOTE] It is **not** allowed to rebase the branch when bumped in Infix.
+
+6. Push the new branch and tags
+   ```bash
+   $ git push origin 2025.02.2-kkit --tags
+   ```
+7. In Infix, checkout new branch of Buildroot
+   ```bash
+   $ cd buildroot
+   $ git fetch
+   $ git checkout 2025.02.2-kkit
+   ```
+8. Push changes
+Commit and push the changes. Don’t forget to update the changelog.
+
+9. Create a pull request.
+
+> [!NOTE] Remember to set the pull request label to `ci:main` to ensure full CI coverage.
+
+
+#### Linux kernel
+
+KernelKit maintains an internal [fork of Linux
+kernel](https://github.com/kernelkit/linux), with branches following
+the naming scheme `kkit-linux-[version].y`, e.g. `kkit-6.12.y`, which
+means a new branch should be created whenever the major kernel version
+is updated. This branch should contain *all* kernel patches used by
+Infix.
+
+KernelKit track the latest Linux kernel LTS (Long-Term Support)
+release and updates. The upgrade of LTS minor releases is expected to
+have low impact and should be done as soon as a patch release of the
+LTS Linux kernel is available.
+
+
+🔁 If you **already have** the Linux kernel repo locally
+
+1. Navigate to the Linux kernel directory
+   ```bash
+   $ cd linux
+   ```
+2. Get latest changes from KernelKit
+   ```bash
+   $ git pull
+   ```
+3. Fetch the latest tags from upstream
+   ```bash
+   $ git fetch upstream --tags
+   ```
+
+🆕 If you don't have the repo locally
+
+1. Clone the KernelKit Linux kernel repository
+   ```bash
+   $ git clone git@github.com:kernelkit/linux.git
+	```
+2. Add the upstream remote
+   ```bash
+   $ git remote add upstream git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
+   ```
+
+3. Checkout correct kernel branch
+   ```bash
+   $ git checkout kkit-linux-6.12.y
+   ```
+
+🛠  Continue from here (applies to both cases)
+
+
+4. Rebase on the upstream release
+   ```bash
+   $ git rebase v6.12.29
+   ```
+
+6. Push changes and the tags
+   ```bash
+
+   $ git push -f origin kkit-linux-6.12.y --tags
+   ```
+
+**Move to your infix directory**
+
+7. Generate patches
+   ```bash
+   $ make x86_64_defconfig
+   $ cd output
+   $ ../utils/kernel-refresh.sh -k /path/to/linux -o 6.12.28 -t v6.12.29
+   ```
+   > [!NOTE] See help of `kernel-refresh.sh` script for more information
+
+
+8. Push changes
+   Commit and push the changes. Don’t forget to update the s:changelog:doc/ChangeLog.md.
+
+9. Create a pull request.
+   > [!NOTE] Remember to set the pull request label to `ci:main` to ensure full CI coverage.
+
+
+### Agree on YANG Model
+
+When making changes to the `confd` and `statd` services, you will often need to update
+the YANG models. If you are adding a new YANG module, it's best to follow the
+structure of an existing one. However, before making any changes, **always discuss
+them with the Infix core team**. This helps avoid issues later in development and
+makes pull request reviews smoother.
+
+
 Testing
 -------

 Manual testing can be done using Qemu by calling <kbd>make run</kbd>,
-see also [Infix in Virtual Environments](virtual.md).
+see also [Infix in Virtual Environments](virtual.md), or on a physical
+device by upgrading to the latest build or "[netbooting](netboot.md)"
+and running the image from RAM.  The latter is how most board porting
+work is done -- **much quicker** change-load-test cycles.

 The Infix automated test suite is built around Qemu and [Qeneth][2], see:

 * [Testing](testing.md)
 * [Docker Image](../test/docker/README.md)

+With any new feature added to Infix, it is essential to include relevant
+test case(s).  See the [Test Development](testing.md#test-development)
+section for guidance on adding test cases.
+

 Reviewing
 ---------
@@ -0,0 +1,171 @@
+DHCP Server
+===========
+
+The DHCPv4 server provides automatic IP address assignment and network
+configuration for clients.  It supports address pools, static host
+assignments, and customizable DHCP options.  It also serves as a DNS
+proxy for local subnets and can even forward queries to upstream DNS
+servers[^1].
+
+> [!NOTE]
+> When using the CLI, the system automatically enables essential options
+> like DNS servers and default gateway based on the system's network
+> configuration.  These options can be disabled, changed or overridden,
+> at any level: global, subnet, or per-host.
+
+
+## Basic Configuration
+
+The following example configures a DHCP server for subnet 192.168.2.0/24
+with an address pool:
+
+```
+admin@example:/> configure
+admin@example:/config/> edit dhcp-server
+admin@example:/config/dhcp-server/> edit subnet 192.168.2.0/24
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/> set pool start-address 192.168.2.100 end-address 192.168.2.200
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/> leave
+```
+
+When setting up the server from the CLI, the system automatically adds a
+few default DHCP options that will be sent to clients: both DNS server
+and default gateway will use the system address on the matching
+interface.
+
+```
+admin@example:/> show running-config
+  "infix-dhcp-server:dhcp-server": {
+    "subnet": [
+      {
+        "subnet": "192.168.2.0/24",
+        "option": [
+          {
+            "id": "dns-server",
+            "address": "auto"
+          },
+          {
+            "id": "router",
+            "address": "auto"
+          }
+        ],
+        "pool": {
+          "start-address": "192.168.2.100",
+          "end-address": "192.168.2.200"
+        }
+      }
+    ]
+  }
+```
+
+> [!IMPORTANT]
+> Remember to set up an interface in this subnet, avoid using addresses
+> in the DHCP pool, or reserved for static hosts.  In Class C networks
+> the router usually has address `.1`.  Depending on the use-case, you
+> may also want to set up routing.
+
+
+## Static Host Assignment
+
+To reserve specific IP addresses for clients based on their MAC address,
+hostname, or client ID:
+
+```
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/> edit host 192.168.2.10
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/host/192.168.2.10/> set match mac-address 00:11:22:33:44:55
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/host/192.168.2.10/> set hostname printer
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/host/192.168.2.10/> leave
+```
+
+Match hosts using a client identifier instead of MAC address:
+
+```
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/> edit host 192.168.1.50
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/host/192.168.1.50/> edit match
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/host/192.168.1.50/match/> set client-id hex c0:ff:ee
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/host/192.168.1.50/match/> leave
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/host/192.168.1.50/> set lease-time infinite
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/host/192.168.1.50/> leave
+```
+
+The `hex` prefix here ensures matching of client ID is done using the
+hexadecimal octets `c0:ff:ee`, three bytes.  Without the prefix the
+ASCII string "c0:ff:ee", eight bytes, is used.
+
+> [!NOTE]
+> The DHCP server is fully RFC conformant, in the case of option 61 this
+> means that using the `hex` prefix will require the client to set the
+> `htype` field of the option to `00`.  See RFC 2132 for details.
+
+
+## Custom DHCP Options
+
+Configure additional DHCP options globally, per subnet, or per host:
+
+```
+admin@example:/config/dhcp-server/> edit subnet 192.168.2.0/24
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/> edit option dns-server
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/option/dns-server/> set address 8.8.8.8
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/option/dns-server/> leave
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/> edit option ntp-server
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/option/ntp-server/> set address 192.168.2.1
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/option/ntp-server/> leave
+```
+
+When configuring, e.g., `dns-server`, or `router` options with the value
+`auto`, the system uses the IP address from the interface matching the
+subnet.  For example:
+
+```
+admin@example:/> show interfaces brief
+Interface    Status  Address
+eth0         UP      192.168.1.1/24
+eth1         UP      192.168.2.1/24
+
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/> edit option dns-server
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/option/dns-server/> set address auto
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/option/dns-server/> leave
+```
+
+In this case, clients in subnet 192.168.1.0/24 will receive 192.168.1.1
+as their DNS server address.
+
+
+## Multiple Subnets
+
+Configure DHCP for multiple networks:
+
+```
+admin@example:/> configure
+admin@example:/config/> edit dhcp-server
+admin@example:/config/dhcp-server/> edit subnet 192.168.1.0/24
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/> set pool start-address 192.168.1.100 end-address 192.168.1.200
+admin@example:/config/dhcp-server/subnet/192.168.1.0/24/> leave
+admin@example:/config/dhcp-server/> edit subnet 192.168.2.0/24
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/> set pool start-address 192.168.2.100 end-address 192.168.2.200
+admin@example:/config/dhcp-server/subnet/192.168.2.0/24/> leave
+```
+
+
+## Monitoring
+
+View active leases and server statistics:
+
+```
+admin@example:/> show dhcp-server
+IP ADDRESS       MAC                HOSTNAME            CLIENT ID             EXPIRES
+192.168.2.22     00:a0:85:00:02:05                      00:c0:ff:ee           3591s
+192.168.1.11     00:a0:85:00:04:06  foo                 01:00:a0:85:00:04:06  3591s
+
+admin@example:/> show dhcp-server statistics
+DHCP offers sent                : 6
+DHCP ACK messages sent          : 5
+DHCP NAK messages sent          : 0
+DHCP decline messages received  : 0
+DHCP discover messages received : 6
+DHCP request messages received  : 5
+DHCP release messages received  : 6
+DHCP inform messages received   : 6
+```
+
+
+[^1]: This requires the system DNS resolver to be configured.
@@ -1,29 +1,29 @@
-Discover Infix Units
-====================
+# Discover Devices
+
+Infix advertises itself via the [mDNS-SD](#mdns-sd) and [LLDP](#lldp)
+discovery protocols.  mDNS-SD has good client support in Windows, macOS
+and on Linux systems.  More on these protocols later.
+
+An even simpler method is available when directly attached to an Infix
+device:

 ```
- .----.      Ethernet       .-------.
- | PC +---------------------+ Infix |
- '----' if1            eth0 '-------'
+       .----.      Ethernet       .-------.
+       | PC +---------------------+ Infix |
+       '----' if1              e1 '-------'
 ```
-Figure 1: PC directly connected over Ethernet to Infix unit (here eth0).

-
-When you wish to discover the IP address of an Infix switch, the simplest
-way is probably to *ping the IPv6 all-hosts* address (ff02::1) over a
-directly connected Ethernet cable. The unit's link-local IPv6 address is
-seen in the response.
-
-In the example below, the PC is connected to Infix via interface *tap0*
-(*tap0* is *if1* in Figure 1) and Infix responds with address
-*fe80::ff:fe00:0*.
+With IPv6 you can *ping the all-hosts* address (ff02::1), the device's
+link-local IPv6 address is then seen in the response.  In the following
+example, the PC here uses *tap0* as *if1*, Infix responds with address
+*fe80::ff:fec0:ffed*.

 ```
 linux-pc:# ping -6 -L -c 3 ff02::1%tap0
 PING ff02::1%tap0(ff02::1%tap0) 56 data bytes
-64 bytes from fe80::ff:fe00:0%tap0: icmp_seq=1 ttl=64 time=0.558 ms
-64 bytes from fe80::ff:fe00:0%tap0: icmp_seq=2 ttl=64 time=0.419 ms
-64 bytes from fe80::ff:fe00:0%tap0: icmp_seq=3 ttl=64 time=0.389 ms
+64 bytes from fe80::ff:fec0:ffed%tap0: icmp_seq=1 ttl=64 time=0.558 ms
+64 bytes from fe80::ff:fec0:ffed%tap0: icmp_seq=2 ttl=64 time=0.419 ms
+64 bytes from fe80::ff:fec0:ffed%tap0: icmp_seq=3 ttl=64 time=0.389 ms

 --- ff02::1%tap0 ping statistics ---
 3 packets transmitted, 3 received, 0% packet loss, time 2043ms
@@ -31,42 +31,42 @@ rtt min/avg/max/mdev = 0.389/0.455/0.558/0.073 ms
 linux-pc:# 
 ```

-The PC could connect then connect to Infix, e.g., using SSH.
+> [!TIP]
+> The `-L` option ignores local responses from the PC.
+
+This address can then be used to connect to the device, e.g., using SSH.
+Notice the syntax `username@address%interface`:

 ```
-linux-pc:# ssh admin@fe80::ff:fe00:0%tap0
-admin@fe80::ff:fe00:0%tap0's password: admin
-admin@infix-00-00-00:~$ 
+linux-pc:# ssh admin@fe80::ff:fec0:ffed%tap0
+admin@fe80::ff:fec0:ffed%tap0's password: admin
+admin@infix-c0-ff-ee:~$ 
 ```

-## Discovery mechanisms available in Infix

-Infix advertises its presence via the [mDNS](#mdns) and [LLDP](#lldp)
-discovery protocols.
+## LLDP

+Infix supports LLDP (IEEE 802.1AB). For a device with factory default
+settings, the link-local IPv6 address can be read from the Management
+Address TLV using *tcpdump* or other sniffing tools[^1]:

-### LLDP
-
-Infix supports LLDP (IEEE 802.1AB). For a unit with factory default
-settings, the PC can readout the link-local IPv6 address from the
-Management Address TLV using *tcpdump* or other sniffing tools[^1].
 ```
 linux-pc:# tcpdump -i tap0 -Qin -v ether proto 0x88cc
 tcpdump: listening on tap0, link-type EN10MB (Ethernet), snapshot length 262144 bytes
 15:51:52.061071 LLDP, length 193
    Chassis ID TLV (1), length 7
-      Subtype MAC address (4): 02:00:00:00:00:00 (oui Unknown)
+      Subtype MAC address (4): 02:00:00:c0:ff:ee (oui Unknown)
    Port ID TLV (2), length 7
-      Subtype MAC address (3): 02:00:00:00:00:00 (oui Unknown)
+      Subtype MAC address (3): 02:00:00:c0:ff:ee (oui Unknown)
    Time to Live TLV (3), length 2: TTL 120s
-    System Name TLV (5), length 14: infix-00-00-00
+    System Name TLV (5), length 14: infix-c0-ff-ee
    System Description TLV (6), length 91
      Infix by KernelKit Linux 5.19.17 #1 SMP PREEMPT_DYNAMIC Wed Jun 7 08:47:23 CEST 2023 x86_64
    System Capabilities TLV (7), length 4
      System  Capabilities [Bridge, WLAN AP, Router, Station Only] (0x009c)
      Enabled Capabilities [Station Only] (0x0080)
    Management Address TLV (8), length 24
-      Management Address length 17, AFI IPv6 (2): fe80::ff:fe00:0
+      Management Address length 17, AFI IPv6 (2): fe80::ff:fec0:ffed
      Interface Index Interface Numbering (2): 2
    Port Description TLV (4), length 4: eth0
    Organization specific TLV (127), length 9: OUI IEEE 802.3 Private (0x00120f)
@@ -83,11 +83,12 @@ tcpdump: listening on tap0, link-type EN10MB (Ethernet), snapshot length 262144
 linux-pc:# 
 ```

-If the unit has an IPv4 address assigned, it is shown in an additional
+If the device has an IPv4 address assigned, it is shown in an additional
 Management Address TLV.

-> **Note** The Management Addresses shown by LLDP are not
-> necessarily associated with the port transmitting the LLDP message. 
+> [!NOTE]
+> The Management Addresses shown by LLDP are not necessarily associated
+> with the port transmitting the LLDP message.

 In the example below, the IPv4 address (10.0.1.1) happens to be
 assigned to *eth0*, while the IPv6 address (2001:db8::1) is not.
@@ -97,11 +98,11 @@ linux-pc:# sudo tcpdump -i tap0 -Qin -v ether proto 0x88cc
 tcpdump: listening on tap0, link-type EN10MB (Ethernet), snapshot length 262144 bytes
 15:46:07.908665 LLDP, length 207
    Chassis ID TLV (1), length 7
-      Subtype MAC address (4): 02:00:00:00:00:00 (oui Unknown)
+      Subtype MAC address (4): 02:00:00:c0:ff:ee (oui Unknown)
    Port ID TLV (2), length 7
-      Subtype MAC address (3): 02:00:00:00:00:00 (oui Unknown)
+      Subtype MAC address (3): 02:00:00:c0:ff:ee (oui Unknown)
    Time to Live TLV (3), length 2: TTL 120s
-    System Name TLV (5), length 14: infix-00-00-00
+    System Name TLV (5), length 14: infix-c0-ff-ee
    System Description TLV (6), length 91
      Infix by KernelKit Linux 5.19.17 #1 SMP PREEMPT_DYNAMIC Wed Jun 7 08:47:23 CEST 2023 x86_64
    System Capabilities TLV (7), length 4
@@ -130,47 +131,251 @@ tcpdump: listening on tap0, link-type EN10MB (Ethernet), snapshot length 262144
 linux-pc:#
 ```

-[^1]: [lldpd: implementation of IEEE 802.1ab
-    (LLDP)](https://github.com/lldp/lldpd) includes *lldpcli*, which
-    is handy to sniff and display LLDP packets.
+The following capabilities are available via NETCONF/RESTCONF or the Infix CLI.

-### mDNS
+### LLDP Enable/Disable

-DNS-SD/mDNS can be used to discover Infix units and services. Infix
-units present their IP addresses, services and hostname within the
-.local domain. This method has good client support in Apple and Linux
-systems. On Linux, tools such as *avahi-browse* or *mdns-scan*[^2] can
-be used to search for devices advertising their services via mDNS.
+The LLDP service can be disabled using the following commands.
+
+```
+admin@infix-c0-ff-ee:/> configure
+admin@infix-c0-ff-ee:/config/> no lldp 
+admin@infix-c0-ff-ee:/config/> leave
+admin@infix-c0-ff-ee:/> 
+```
+
+To reenable it from the CLI config mode:
+
+```
+admin@test-00-01-00:/config/> set lldp enabled 
+admin@test-00-01-00:/config/> leave
+```
+
+### LLDP Message Transmission Interval
+
+By default, LLDP uses a `message-tx-interval` of 30 seconds, as defined
+by the IEEE standard. Infix allows this value to be customized.
+To change it using the CLI:
+
+```
+admin@test-00-01-00:/config/> set lldp message-tx-interval 1
+admin@test-00-01-00:/config/> leave
+```
+
+### LLDP Administrative Status per Interface
+
+Infix supports configuring the LLDP administrative status on a per-port
+basis. The default mode is `tx-and-rx`, but the following options are 
+also supported:
+
+- `rx-only` – Receive LLDP packets only
+- `tx-only` – Transmit LLDP packets only
+- `disabled` – Disable LLDP on the interface
+
+Example configuration:
+
+```
+admin@test-00-01-00:/config/> set lldp port e8 dest-mac-address 01:80:C2:00:00:0E admin-status disabled
+admin@test-00-01-00:/config/> set lldp port e5 dest-mac-address 01:80:C2:00:00:0E admin-status rx-only 
+admin@test-00-01-00:/config/> set lldp port e6 dest-mac-address 01:80:C2:00:00:0E admin-status tx-only
+admin@test-00-01-00:/config/> leave
+```
+
+> [!NOTE]
+> The destination MAC address must be the standard LLDP multicast 
+> address: `01:80:C2:00:00:0E`.
+
+###  Displaying LLDP Neighbor Information
+
+In CLI mode, Infix also provides a convenient `show lldp` command to
+list LLDP neighbors detected on each interface:
+
+```
+admin@test-00-01-00:/> show lldp 
+INTERFACE       REM-IDX   TIME        CHASSIS-ID          PORT-ID             
+e5              1         902         00:a0:85:00:04:01   00:a0:85:00:04:07   
+e6              3         897         00:a0:85:00:03:01   00:a0:85:00:03:07   
+e8              2         901         00:a0:85:00:02:01   00:a0:85:00:02:05
+```
+
+## mDNS-SD
+
+DNS-SD/mDNS-SD can be used to discover Infix devices and services.  By
+default, Infix use the `.local` domain for advertising services.  Some
+networks use `.lan` instead, so this configurable:
+
+```
+admin@infix-c0-ff-ee:/> configure
+admin@infix-c0-ff-ee:/config/> edit mdns
+admin@infix-c0-ff-ee:/config/mdns/> set domain lan
+```
+
+Other available settings include limiting the interfaces mDNS responder
+acts on:
+
+```
+admin@infix-c0-ff-ee:/config/> set interfaces allow e1
+```
+
+or
+
+```
+admin@infix-c0-ff-ee:/config/> set interfaces deny wan
+```
+
+The `allow` and `deny` settings are complementary, `deny` always wins.
+
+----
+
+In Linux, tools such as *avahi-browse* or *mdns-scan*[^2] can be used to
+search for devices advertising their services via mDNS.

 ```
 linux-pc:# avahi-browse -ar
-+   tap0 IPv6 infix-00-00-00                                SFTP File Transfer   local
-+   tap0 IPv4 infix-00-00-00                                SFTP File Transfer   local
-+   tap0 IPv6 infix-00-00-00                                SSH Remote Terminal  local
-+   tap0 IPv4 infix-00-00-00                                SSH Remote Terminal  local
-=   tap0 IPv4 infix-00-00-00                                SFTP File Transfer   local
-   hostname = [infix-00-00-00.local]
+   tap0 IPv6 infix-c0-ff-ee                                SFTP File Transfer   local
+   tap0 IPv4 infix-c0-ff-ee                                SFTP File Transfer   local
+   tap0 IPv6 infix-c0-ff-ee                                SSH Remote Terminal  local
+   tap0 IPv4 infix-c0-ff-ee                                SSH Remote Terminal  local
+=   tap0 IPv4 infix-c0-ff-ee                                SFTP File Transfer   local
+   hostname = [infix-c0-ff-ee.local]
   address = [10.0.1.1]
   port = [22]
   txt = []
-=   tap0 IPv4 infix-00-00-00                                SSH Remote Terminal  local
-   hostname = [infix-00-00-00.local]
+=   tap0 IPv4 infix-c0-ff-ee                                SSH Remote Terminal  local
+   hostname = [infix-c0-ff-ee.local]
   address = [10.0.1.1]
   port = [22]
   txt = []
-=   tap0 IPv6 infix-00-00-00                                SFTP File Transfer   local
-   hostname = [infix-00-00-00.local]
-   address = [fe80::ff:fe00:0]
+=   tap0 IPv6 infix-c0-ff-ee                                SFTP File Transfer   local
+   hostname = [infix-c0-ff-ee.local]
+   address = [fe80::ff:fec0:ffed]
   port = [22]
   txt = []
-=   tap0 IPv6 infix-00-00-00                                SSH Remote Terminal  local
-   hostname = [infix-00-00-00.local]
-   address = [fe80::ff:fe00:0]
+=   tap0 IPv6 infix-c0-ff-ee                                SSH Remote Terminal  local
+   hostname = [infix-c0-ff-ee.local]
+   address = [fe80::ff:fec0:ffed]
   port = [22]
   txt = []
 ^C
 linux-pc:#
 ```
+
+> [!TIP]
+> The `-t` option is also very useful, it stops browsing automatically
+> when a "more or less complete list" has been printed.  However, some
+> devices on the LAN may be in deep sleep so run the command again if
+> you cannot find the device you are looking for.
+
+Additionally, *avahi-resolve-host-name* can be used to verify domain
+name mappings for IP addresses.  By default, it translates from IPv4
+addresses.  This function allows users to confirm that addresses are
+mapped correctly.
+
+```
+linux-pc:# avahi-resolve-host-name infix-c0-ff-ee.local
+infix-c0-ff-ee.local	10.0.1.1
+linux-pc:#
+```
+
+Thanks to mDNS we can use the advertised name instead of the IP
+address for operations like `ping` and `ssh` as shown below:
+
+```
+linux-pc:# ping infix-c0-ff-ee.local -c 3
+PING infix-c0-ff-ee.local (10.0.1.1) 56(84) bytes of data.
+64 bytes from 10.0.1.1: icmp_seq=1 ttl=64 time=0.852 ms
+64 bytes from 10.0.1.1: icmp_seq=2 ttl=64 time=1.12 ms
+64 bytes from 10.0.1.1: icmp_seq=3 ttl=64 time=1.35 ms
+
+--- infix-c0-ff-ee.local ping statistics ---
+3 packets transmitted, 3 received, 0% packet loss, time 2003ms
+rtt min/avg/max/mdev = 0.852/1.105/1.348/0.202 ms
+
+linux-pc:# ssh admin@infix-c0-ff-ee.local
+(admin@infix-c0-ff-ee.local) Password: 
+.-------.
+|  . .  | Infix OS — Immutable.Friendly.Secure
+|-. v .-| https://kernelkit.org
+'-'---'-
+
+Run the command 'cli' for interactive OAM
+
+linux-pc:#
+```
+
+To disable mDNS/mDNS-SD, type the commands:
+
+```
+admin@infix-c0-ff-ee:/> configure 
+admin@infix-c0-ff-ee:/config/> no mdns
+admin@infix-c0-ff-ee:/config/> leave
+```
+
+### Human-Friendly Hostname Alias
+
+Each Infix deviuce advertise itself as *infix.local*, in addition to its
+full hostname (e.g., *infix-c0-ff-ee.local* or *foo.local*).  This alias
+works seamlessly on a network with a single Infix device, and makes it
+easy to connect when the exact hostname is not known in advance.  The
+examples below show how the alias can be used for actions such as
+pinging or establishing an SSH connection:
+
+```
+linux-pc:# ping infix.local -c 3
+PING infix.local (10.0.1.1) 56(84) bytes of data.
+64 bytes from 10.0.1.1: icmp_seq=1 ttl=64 time=0.751 ms
+64 bytes from 10.0.1.1: icmp_seq=2 ttl=64 time=2.28 ms
+64 bytes from 10.0.1.1: icmp_seq=3 ttl=64 time=1.42 ms
+
+--- infix.local ping statistics ---
+3 packets transmitted, 3 received, 0% packet loss, time 2003ms
+rtt min/avg/max/mdev = 0.751/1.482/2.281/0.626 ms
+
+linux-pc:# ssh admin@infix.local
+(admin@infix.local) Password: 
+.-------.
+|  . .  | Infix OS — Immutable.Friendly.Secure
+|-. v .-| https://kernelkit.org
+'-'---'-
+
+Run the command 'cli' for interactive OAM
+
+admin@infix-c0-ff-ee:~$
+```
+
+When multiple Infix devices are present on the LAN the alias will not
+uniquely identify a device; *infix.local* will refer to any of the
+Infix devices, likely the one that first appeared.
+
+> [!NOTE]
+> When multiple Infix devices are present on the LAN, use the full name,
+> e.g., *infix-c0-ff-ee.local* or *foo.local* rather than the alias
+> *infix.local* to deterministically connect to the device.
+
+
+### Browse Network Using *network.local*
+
+Another mDNS alias that all Infix devices advertise is *network.local*.
+This is a web service which basically runs `avahi-browse` and displays a
+table of other Infix devices and their services.
+
+![Netbrowse Service - network.local](img/network-local.png)
+
+With multiple Infix devices on the LAN, one will take the role of your
+portal to access all others, if it goes down another takes its place.
+
+To disable the netbrowse service, and the *network.local* alias, the
+following commands can be used:
+
+```
+admin@infix-c0-ff-ee:/> configure 
+admin@infix-c0-ff-ee:/config/> edit web
+admin@infix-c0-ff-ee:/config/web/> no netbrowse
+admin@infix-c0-ff-ee:/config/web/> leave
+```
+
+
+[^1]: E.g., [lldpd](https://github.com/lldp/lldpd) which includes the
+    *lldpcli* too, handy to sniff and display LLDP packets.
 [^2]: [mdns-scan](http://0pointer.de/lennart/projects/mdns-scan/): a
-    tool for scanning for mDNS/DNS-SD published services on the local
-    network
+    tool for scanning for mDNS/DNS-SD services on the local network.
@@ -6,13 +6,7 @@ This column contains the mapping between YANG and Linux / Ethtool counters.
 ┌─────────────────────────────────┬──────────────────────────────────┐
 │ YANG                            │ Linux / Ethtool                  │
 ├─────────────────────────────────┼──────────────────────────────────┤
-│ out-frames                      │ FramesTransmittedOK              │
-├─────────────────────────────────┼──────────────────────────────────┤
-│ out-multicast-frames            │ MulticastFramesXmittedOK         │
-├─────────────────────────────────┼──────────────────────────────────┤
-│ out-broadcast-frames            │ BroadcastFramesXmittedOK         │
-├─────────────────────────────────┼──────────────────────────────────┤
-│ in-total-frames                 │ FramesReceivedOK,                │
+│ in-total-octets                 │ FramesReceivedOK,                │
 │                                 │ FrameCheckSequenceErrors         │
 │                                 │ FramesLostDueToIntMACRcvError    │
 │                                 │ AlignmentErrors                  │
@@ -25,8 +19,23 @@ This column contains the mapping between YANG and Linux / Ethtool counters.
 ├─────────────────────────────────┼──────────────────────────────────┤
 │ in-broadcast-frames             │ BroadcastFramesReceivedOK        │
 ├─────────────────────────────────┼──────────────────────────────────┤
+│ in-error-fcs-frames             │ FrameCheckSequenceErrors         │
+├─────────────────────────────────┼──────────────────────────────────┤
 │ in-error-undersize-frames       │ undersize_pkts                   │
 ├─────────────────────────────────┼──────────────────────────────────┤
-│ in-error-fcs-frames             │ FrameCheckSequenceErrors         │
+| in-error-oversize-frames        | etherStatsJabbers,               |
+|                                 | etherStatsOversizePkts           |
+├─────────────────────────────────┼──────────────────────────────────┤
+│ in-error-mac-internal-frames    │ FramesLostDueToIntMACRcvError    │
+├─────────────────────────────────┼──────────────────────────────────┤
+│ out-frames                      │ FramesTransmittedOK              │
+├─────────────────────────────────┼──────────────────────────────────┤
+│ out-multicast-frames            │ MulticastFramesXmittedOK         │
+├─────────────────────────────────┼──────────────────────────────────┤
+│ out-broadcast-frames            │ BroadcastFramesXmittedOK         │
+├─────────────────────────────────┼──────────────────────────────────┤
+│ infix-eth:out-good-octets       │ OctetsTransmittedOK              │
+├─────────────────────────────────┼──────────────────────────────────┤
+│ infix-eth:in-good-octets        │ OctetsReceivedOK                 │
 └─────────────────────────────────┴──────────────────────────────────┘
 ```
@@ -0,0 +1,203 @@
+# Management
+
+The system utilizes YANG models for keeping configuration and operational
+data. These databases can be managed through different interfaces such
+as NETCONF, RESTCONF, and CLI via SSH or Console.
+
+## SSH Management
+
+An SSH server (SSHv2) is provided for remote management. It can be
+enabled/disabled as shown below.
+
+```
+admin@example:/> configure
+admin@example:/config/> edit ssh
+admin@example:/config/ssh/> set enabled
+admin@example:/config/ssh/>
+```
+
+By default the SSH server accepts connections to port 22 on all its IP
+addresses, but this can be adjusted using the `listen` command. To
+make the server (only) listen for incoming connections to IP address
+_192.168.1.1_ and port _12345_ the following commands can be used.
+
+```
+admin@example:/> configure
+admin@example:/config/> edit ssh
+admin@example:/config/ssh/> show
+enabled true;
+hostkey genkey;
+listen ipv4 {
+  address 0.0.0.0;
+  port 22;
+}
+listen ipv6 {
+  address ::;
+  port 22;
+}
+admin@example:/config/ssh/> no listen ipv6
+admin@example:/config/ssh/> edit listen ipv4
+admin@example:/config/ssh/listen/ipv4/> set address 192.168.1.1
+admin@example:/config/ssh/listen/ipv4/> set port 12345
+admin@example:/config/ssh/listen/ipv4/>
+```
+
+The default SSH hostkey is generated on first boot and is used in both
+SSH and NETCONF (SSH transport). Custom keys can be added to the
+configuration in `ietf-keystore`. The only supported hostkey type is
+RSA for now, thus the private key must be
+`ietf-crypto-types:rsa-private-key-format` and the public key
+`ietf-crypto-types:ssh-public-key-format`
+
+### Use your own SSH hostkeys
+
+Hostkeys can be generated with OpenSSL:
+```bash
+openssl genpkey -quiet -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -outform PEM > mykey
+openssl rsa -RSAPublicKey_out < mykey > mykey.pub
+```
+Store the keys in `ietf-keystore` _without_ the header and footer information
+created by OpenSSL.
+
+After the key has been stored in the keystore and given the name
+_mykey_ it can be added to SSH configuration:
+
+	admin@example:/> configure
+	admin@example:/config/> edit ssh
+	admin@example:/config/ssh/> set hostkey mykey
+
+## Console Port
+
+For units with a console port, it is possible for users to login to
+shell/CLI with functionality similar to what is provided via SSH.
+
+The type and setup for your console port is product specific. For
+instance, it can be a USB-C port connected to the CPU serial port
+using a USB-to-serial converter. To connect you would need a USB-C cable
+connected to the console port of the device. The serial port is
+typically setup to run at 115200 baud, 8N1.
+
+
+```
+Infix OS — Immutable.Friendly.Secure v24.11.1 (ttyS0)
+example login: admin
+Password:
+.-------.
+|  . .  | Infix OS — Immutable.Friendly.Secure
+|-. v .-| https://kernelkit.org
+'-'---'-'
+
+Run the command 'cli' for interactive OAM
+
+admin@example:~$
+```
+
+The `resize` command can be used to update terminal settings to the
+size of your terminal window.
+
+```
+admin@example:~$ resize
+COLUMNS=115;LINES=59;export COLUMNS LINES;
+admin@example:~$
+```
+
+CLI can be entered from shell in the same way as for SSH.
+
+```
+admin@example:~$ cli
+
+See the 'help' command for an introduction to the system
+
+admin@example:/> show interfaces
+INTERFACE       PROTOCOL   STATE       DATA
+lo              ethernet   UP          00:00:00:00:00:00
+                ipv4                   127.0.0.1/8 (static)
+                ipv6                   ::1/128 (static)
+e1              ethernet   LOWER-DOWN  00:53:00:06:03:01
+e2              ethernet   LOWER-DOWN  00:53:00:06:03:02
+...
+admin@example:/>
+```
+
+## Web, Web-console and RESTCONF
+
+The system provides a set of Web services:
+
+- a rudimentary Web server, currently limited to an information page
+- a RESTCONF server with equivalent management capabilities as NETCONF
+- a Web console service, where the shell/CLI can be accessed via
+  HTTPS, similar to connecting via a console port or SSH
+
+There is also a *Netbrowse* Web service presenting information about
+the unit's neighbors, collected via mDNS (see
+[Discovery](discovery.md) for more details).
+
+```
+admin@example:/> configure
+admin@example:/config/> edit web
+admin@example:/config/web/> help
+  enabled                           Enable or disable on all web services.
+  console                           Web console interface.
+  netbrowse                         mDNS Network Browser.
+  restconf                          IETF RESTCONF Server.
+admin@example:/config/web/>
+```
+
+### Enable/disable Web Service and Server
+
+The Web service can be enabled as shown below.
+
+```
+admin@example:/> configure
+admin@example:/config/> edit web
+admin@example:/config/web/> set enabled
+admin@example:/config/web/> 
+```
+
+Enabling the Web service implies that a Web server is
+enabled. Currently this Web server provides generic Infix information,
+as well as a link to a Web console. The Web server uses HTTPS; any
+HTTP request is redirected to HTTPS.
+
+The _enabled_ setting for the Web service acts as a global
+enable/disable setting for the other Web services (Web console,
+RESTCONF and Netbrowse).
+
+### Enable/disable Web Console
+
+The Web console service provides a terminal service similar to Console
+or SSH. The Web console is secured via HTTPS on port 7861.
+
+The Web console has its own enable/disable setting, but will only be
+activated if the Web service is enabled. The example below shows how
+to disable the Web console.
+
+```
+admin@example:/config/web/> edit console
+admin@example:/config/web/console/> no enabled
+admin@example:/config/web/console/>
+```
+
+### Enable/disable RESTCONF Service
+
+Alternatively, the system can be managed remotely using
+RESTCONF. Meaning you can `curl` it instead of using a dedicated
+NETCONF client.
+
+The RESTCONF service has its own enable/disable setting, but will
+only be activated if the Web service is enabled. The example below
+shows how to disable the RESTCONF service.
+
+```
+admin@example:/config/web/> edit restconf
+admin@example:/config/web/restconf/> no enabled
+admin@example:/config/web/restconf/>
+```
+
+# System Upgrade
+
+See [upgrading procedures and boot order][1] for information on
+    upgrading.
+
+
+[1]: system.md#upgrade-procedures-and-boot-order
@@ -0,0 +1,130 @@
+Netboot HowTo
+=============
+
+This document describes how to set up network booting U-Boot devices on
+a LAN, e.g., when working with an evaluation board or other embedded
+system.  The most secure way to do this is with a local LAN between a PC
+and the device.
+
+Instead of setting up everything in U-Boot to download the Linux Image,
+device tree, and initramfs, we will let U-Boot download a script with
+instructions to run.  When you have multiple systems (boards) this
+quickly becomes a lot easier to manage.
+
+> [!NOTE]
+> Instructions in this HowTo assume a Debian based development system,
+> e.g., Ubuntu or Linux Mint.
+
+
+## Network Interface Setup
+
+For two dedicated network interfaces, here `eth2` and `eth3` (ymmv), we
+create an old-style interfaces config[^1] with the following content:
+
+```
+# /etc/network/interfaces.d/gimli
+auto eth2
+iface eth2 inet static
+        address 192.168.0.1
+        netmask 255.255.255.0
+
+auto eth3
+iface eth3 inet manual
+```
+
+> [!TIP]
+> Use configuration file names in `.d/` directories that make sense and
+> can easily be remembered.  Here we use the hostname of the PC.
+
+
+## DHCP/TFTP Server Setup
+
+The examples given here use `dnsmasq`, which provides both DHCP and TFTP
+server support.  The same can be achieved with other implementations.
+
+Similar to `interfaces.d`, dnsmasq has an `/etc/dnsmasq.d` directory so
+we can use "snippets" instead of modifying `/etc/dnsmasq.conf` directly.
+Add a file called `/etc/dnsmasq.d/gimli`.
+
+Initial content:
+
+```
+# Remember IP address handed out to BOOTP clients
+bootp-dynamic
+# Disable check-if-ip-address-is-already-used
+no-ping
+
+# Enable TFTP server, use /srv/ftp, same as any FTP server, useful
+# when using the same images for system upgrade as for netbooting.
+enable-tftp
+tftp-root=/srv/ftp
+```
+
+> [!CAUTION]
+> First of all, make sure you DO NOT accidentally set up dnsmasq so that
+> it starts acting as a DHCP server also on your office LAN!  Follow the
+> instructions below for more details.
+
+If you have many interfaces used for lab equipment and only one office
+LAN interface, then use something like this:
+
+```
+# Disable DHCP server on loopback and office LAN (eth0)
+except-interface=lo
+except-interface=eth0
+```
+
+To further lock this down, we only run the DHCP server on each of the
+interfaces used for lab equipment, with a dedicated IP range as well:
+
+```
+# Currently I have an imx8mp-evk on eth2, so on my system I have a
+# symlink bootfile-eth2 -> netboot.scr
+interface=eth2
+dhcp-range=192.168.0.100,192.168.0.199,1h
+dhcp-boot=tag:eth2,bootfile-eth2
+```
+
+## Bootfile netboot.scr
+
+The bootfile U-Boot retrieves from the TFTP server is a script that
+looks like this, `netboot.sh`:
+
+```sh
+setenv ramdisk_addr_r 0x58000000
+setenv fdt_addr_r     0x50400000
+
+setenv autoboot off
+tftp ${fdt_addr_r}     imx8mp-evk/imx8mp-evk.dtb
+tftp ${kernel_addr_r}  imx8mp-evk/Image
+tftp ${ramdisk_addr_r} imx8mp-evk/rootfs.squashfs
+
+setenv bootargs console=ttymxc1,115200 root=/dev/ram0 brd.rd_size=500000 rauc.slot=net
+booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}
+```
+
+U-Boot cannot read script files directly, so we need to wrap it with a
+FIT format header, this is done by first converting it on the PC:
+
+```
+$ mkimage -T script -d netboot.sh netboot.scr
+```
+
+The output is `netboot.scr` which we symlink to above in the dnsmasq
+setup step.
+
+
+## U-Boot Commands
+
+U-Boot is a maze of environment variables, some with values, some wrap
+commands, and most are undocumented.  We will use a prefix for our
+variables to ensure we do not overwrite anything you may want to use
+later.
+
+```sh
+==> setenv ixboot 'dhcp && source \${fileaddr}'
+==> saveenv
+```
+
+
+[^1]: To prevent NetworkManager from automatically managing the interfaces.
@@ -7,9 +7,10 @@ model forms the base, extended with [ietf-ip.yang][2] and other layer-3
 IETF models.  The layer-2 bridge and aggregate models are defined by
 Infix to exploit the unique features not available in IEEE models.

-> **Note:** when issuing `leave` to activate your changes, remember to
-> also save your settings, `copy running-config startup-config`.  See
-> the [CLI Introduction](cli/introduction.md) for a background.
+> [!IMPORTANT]
+> When issuing `leave` to activate your changes, remember to also save
+> your settings, `copy running-config startup-config`.  See the [CLI
+> Introduction](cli/introduction.md) for a background.


 ## Interface LEGO®
@@ -42,18 +43,18 @@ it.  In this example, traffic assigned to the VLAN in question would be
 diverted to the VLAN interface before entering the bridge, while all
 other traffic would be bridged as usual.

-| **Type** | **Yang Model**             | **Description**                                               |
-|----------|----------------------------|---------------------------------------------------------------|
-| bridge   | infix-if-bridge            | SW implementation of an IEEE 802.1Q bridge                    |
-| ip       | ietf-ip, infix-ip          | IP address to the subordinate interface                       |
-| vlan     | infix-if-vlan              | Capture all traffic belonging to a specific 802.1Q VID        |
-| lag[^1]  | infix-if-lag               | Bonds multiple interfaces into one, creating a link aggregate |
-| lo       | ietf-interfaces            | Software loopback interface                                   |
-| eth      | ieee802-ethernet-interface | Physical Ethernet device/port.                                |
-|          | infix-ethernet-interface   |                                                               |
-| veth     | infix-if-veth              | Virtual Ethernet pair, typically one end is in a container    |
-| *common* | ietf-interfaces,           | Properties common to all interface types                      |
-|          | infix-interfaces           |                                                               |
+| **Type** | **Yang Model**             | **Description**                                              |
+|----------|----------------------------|--------------------------------------------------------------|
+| bridge   | infix-if-bridge            | SW implementation of an IEEE 802.1Q bridge                   |
+| ip       | ietf-ip, infix-ip          | IP address to the subordinate interface                      |
+| vlan     | infix-if-vlan              | Capture all traffic belonging to a specific 802.1Q VID       |
+| lag      | infix-if-lag               | Link aggregation, static and IEEE 802.3ad (LACP)             |
+| lo       | ietf-interfaces            | Software loopback interface                                  |
+| eth      | ieee802-ethernet-interface | Physical Ethernet device/port.                               |
+|          | infix-ethernet-interface   |                                                              |
+| veth     | infix-if-veth              | Virtual Ethernet pair, typically one end is in a container   |
+| *common* | ietf-interfaces,           | Properties common to all interface types                     |
+|          | infix-interfaces           |                                                              |


 ## Data Plane
@@ -103,10 +104,11 @@ The `description` is saved as Linux `ifalias` on an interface.  It is a
 free-form string, useful for describing purpose or just adding comments
 for remote debugging, e.g., using the operational datastore.

-> **Note:** there is no validation or safety checks performed by the
-> system when using `custom-phys-address`.  In particular the `offset`
-> variant can be dangerous to use -- pay attention to the meaning of
-> bits in the upper-most octet: local bit, multicast/group, etc.
+> [!CAUTION]
+> There is no validation or safety checks performed by the system when
+> using `custom-phys-address`.  In particular the `offset` variant can
+> be dangerous to use -- pay attention to the meaning of bits in the
+> upper-most octet: local bit, multicast/group, etc.

 #### Fixed custom MAC

@@ -152,9 +154,9 @@ fabric!
 #### MAC Bridge

 In Infix ports are by default not switch ports, unless the customer
-specific factory config sets it up this way.  To enable switching
-between ports you create a bridge and then add ports to that
-bridge. That's it.
+specific factory config sets it up this way.  To enable switching, with
+offloading if you have a switch chipset, between ports you create a
+bridge and then add ports to that bridge.  Like this:

 ```
 admin@example:/> configure
@@ -167,11 +169,16 @@ admin@example:/config/> leave

 Here we add two ports to bridge `br0`: `eth0` and `eth1`.

-> **Note:** Infix has many built-in helpers controlled by convention.
-> E.g., if you name your bridge `brN`, where `N` is a number, Infix sets
-> the interface type automatically and unlocks all bridge features.
-> Other "magic" names are `ethN.M` for VLAN M on top of `ethN`, or
-> `dockerN` to create an IP masquerading container bridge.
+> [!TIP]
+> The CLI has several built-in helpers governed by convention.  E.g.,
+> naming bridges `brN`, where `N` is a number, the type is *inferred*
+> automatically and unlocks all bridge features.  Other conventions are
+> `vethNA`, where `N` is a number and `A` is a letter ('a' for access
+> port and 'b' for bridge side is common), and `ethN.M` for VLAN M on
+> top of `ethN`, or `dockerN` for a IP masquerading container bridge.
+>
+> Note, this inference only works with the CLI, configuring networking
+> over NETCONF or RESTCONF requires setting the type explicitly.

 ![A MAC bridge with two ports](img/mac-bridge.svg)

@@ -182,11 +189,11 @@ bridge should be used instead.

 #### VLAN Filtering Bridge

-By default bridges in Linux do not filter based on VLAN tags.  It can be
-enabled in Infix when creating a bridge by adding a port to a VLAN as a
-tagged or untagged member.  Use the port default VID (PVID) setting to
-control VLAN association for traffic ingressing a port untagged (default
-PVID: 1).
+By default bridges in Linux do not filter based on VLAN tags.  This can
+be enabled when creating a bridge by adding a port to a VLAN as a tagged
+or untagged member.  Use the port default VID (PVID) setting to control
+VLAN association for traffic ingressing a port untagged (default PVID:
+1).

 ```
 admin@example:/config/> edit interface br0
@@ -214,9 +221,15 @@ admin@example:/config/interface/br0/> set bridge vlans vlan 10 tagged br0
 admin@example:/config/interface/br0/> set bridge vlans vlan 20 tagged br0
 ```

-> To route or to manage via a VLAN, a VLAN interface needs to be created
-> on top of the bridge, see section [VLAN Interfaces](#vlan-interfaces)
-> below for more on this topic.
+To route or to manage via a VLAN, a VLAN interface needs to be created
+on top of the bridge, see section [VLAN Interfaces](#vlan-interfaces)
+below for more on this topic.
+
+> [!NOTE]
+> In some use-cases only a single management VLAN on the bridge is used.
+> For the example above, if the bridge itself is an untagged member only
+> in VLAN 10, IP addresses can be set directly on the bridge without the
+> need for dedicated VLAN interfaces on top of the bridge.


 #### Multicast Filtering and Snooping
@@ -227,10 +240,11 @@ also supports "snooping", i.e., IGMP and MLD, to automatically reduce
 the broadcast effects of multicast.  See the next section for a summary
 of the [terminology used](#terminology--abbreviations).

-> **Note:** currently there is no way to just enable multicast filtering
-> without also enabling snooping.  This may change in the future, in
-> which case a `filtering` enabled setting will be made available along
-> with the existing `snooping` setting.
+> [!IMPORTANT]
+> Currently there is no way to just enable multicast filtering without
+> also enabling snooping.  This may change in the future, in which case
+> a `filtering` enabled setting will be made available along with the
+> existing `snooping` setting.

 When creating your bridge you must decide if you need a VLAN filtering
 bridge or a plain bridge (see previous section).  Multicast filtering is
@@ -271,15 +285,15 @@ br0                  224.1.1.1             e3, e2
 br0                  ff02::6a              br0
 ```

-It is a small LAN, so our bridge has already become the elected IGMP
-querier.  We see it is ours because the timeout is `None`, and we
-recognize our IP address.  We can also see two ports that have joined
-the same IPv4 multicast group, 224.1.1.1, and one join from Infix itself
-for the IPv6 group ff02::6a.
+This is a rather small LAN, so our bridge has already become the elected
+IGMP querier.  We see it is ours because the timeout is `None`, and we
+recognize the IP address the system has detected, as ours.  We can also
+see two ports that have joined the same IPv4 multicast group, 224.1.1.1,
+and one join from the system itself for the IPv6 group ff02::6a.

-Now, let's see what happens when we add another bridge, with VLAN
-filtering enabled.  We skip the boring parts about how to move ports
-e4-e7 to `br1` and assign them to VLANs, and again, focus on the
+Now, let us see what happens when we add another bridge, this time with
+VLAN filtering enabled.  We skip the boring parts about how to move
+ports e4-e7 to `br1` and assign them to VLANs, and again, focus on the
 multicast bits only:

 ```
@@ -291,7 +305,7 @@ admin@example:/config/interface/br1/> leave
 admin@example:/> copy running-config startup-config
 ```

-Let's see what we get:
+Let us see what we get:

 ```
 admin@example:/> show ip multicast
@@ -370,22 +384,314 @@ an IGMP/MLD fast-leave port.
   tables shown above, a *None* timeout is declared when the current
   device is the active querier

-> **Note:** the reason why multicast flooding is enabled by default is
-> to ensure safe co-existence with MAC multicast, which is very common
-> in industrial networks.  It also allows end devices that do not know
-> of IGMP/MLD to communicate over multicast as long as the group they
-> have chosen is not used by other IGMP/MLD aware devices on the LAN.
+> [!TIP]
+> The reason why multicast flooding is enabled by default is to ensure
+> safe co-existence with MAC multicast, which is common in industrial
+> networks.  It also allows end devices that do not know of IGMP/MLD to
+> communicate over multicast as long as the group they have chosen is
+> not used by other IGMP/MLD aware devices on the LAN.
 >
 > As soon as an IGMP/MLD membership report to "join" a group is received
-> the group is added to the MDB and forwarding to other ports stop.  The
-> only exception to this rule is multicast router ports.
+> the group is added to the kernel MDB and forwarding to other ports
+> stop.  The only exception to this rule is multicast router ports.
+>
+> If your MAC multicast forwarding is not working properly, it may be
+> because an IP multicast group maps to the same MAC address.  Please
+> see [RFC 1112][RFC1112] for details.  Use static multicast router
+> ports, or static multicast MAC filters, to mitigate.

+[RFC1112]: https://www.rfc-editor.org/rfc/rfc1112.html
 [RFC3376]: https://www.rfc-editor.org/rfc/rfc3376.html
 [RFC3810]: https://www.rfc-editor.org/rfc/rfc3810.html

+#### Forwarding of IEEE Reserved Group Addresses
+
+Addresses in the range `01:80:C2:00:00:0X` are used by various bridge
+signaling protocols, and are not forwarded by default.  Still, it is
+sometimes useful to let the bridge forward such packets, this can be
+done by specifying protocol names or the last address *nibble* as
+decimal value `0..15`:
+
+```
+admin@example:/config/> edit interface br0 bridge
+admin@example:/config/interface/br0/bridge/> set ieee-group-forward     # Tap the ? ley for alternatives
+  [0..15]  List of IEEE link-local protocols to forward, e.g., STP, LLDP
+  dot1x    802.1X Port-Based Network Access Control.
+  lacp     802.3 Slow Protocols, e.g., LACP.
+  lldp     802.1AB Link Layer Discovery Protocol (LLDP).
+  stp      Spanning Tree (STP/RSPT/MSTP).
+admin@example:/config/interface/br0/bridge/> set ieee-group-forward
+```
+
+The following example configures bridge *br0* to forward LLDP packets.
+
+```
+admin@example:/config/interface/br0/bridge/> set ieee-group-forward lldp
+admin@example:/config/interface/br0/bridge/>
+```
+
+
+### Link Aggregation
+
+A link aggregate, or *lag*, allows multiple physical interfaces to be
+combined into a single logical interface, providing increased bandwidth
+(in some cases) and redundancy (primarily).  Two modes of qualifying lag
+member ports are available:
+
+ 1. **static**: Active members selected based on link status (carrier)
+ 2. **lacp:** IEEE 802.3ad Link Aggregation Control Protocol
+
+In LACP mode, LACPDUs are exchanged by the link partners to qualify each
+lag member, while in static mode only carrier is used.  This additional
+exchange in LACP ensures traffic can be forwarded in both directions.
+
+Traffic distribution, for both modes, across the active lag member ports
+is determined by the hash policy[^1].  It uses an XOR of the source,
+destination MAC addresses and the EtherType field.  This, IEEE
+802.3ad-compliant, algorithm will place all traffic to a particular
+network peer on the same link.  Meaning there is no increased bandwidth
+for communication between two specific devices.
+
+> [!TIP]
+> Similar to other interface types, naming your interface `lagN`, where
+> `N` is a number, allows the CLI to automatically infer the interface
+> type as LAG.
+
+
+#### Basic Configuration
+
+Creating a link aggregate interface and adding member ports:
+
+```
+admin@example:/> configure
+admin@example:/config/> edit interface lag0
+admin@example:/config/interface/lag0/> set lag mode static
+admin@example:/config/interface/lag0/> end
+admin@example:/config/> set interface eth7 lag-port lag lag0
+admin@example:/config/> set interface eth8 lag-port lag lag0
+admin@example:/config/> leave
+```
+
+A static lag responds only to link (carrier) changes of member ports.
+E.g., in this example egressing traffic is continuously distributed over
+the two links until link down on one link is detected, triggering all
+traffic to be steered to the sole remaining link.
+
+
+#### LACP Configuration
+
+LACP mode provides dynamic negotiation of the link aggregate.  Key
+settings include:
+
+```
+admin@example:/> configure
+admin@example:/config/> edit interface lag0
+admin@example:/config/interface/lag0/> set lag mode lacp
+admin@example:/config/interface/lag0/> set lag lacp mode passive
+admin@example:/config/interface/lag0/> set lag lacp rate fast
+admin@example:/config/interface/lag0/> set lag lacp system-priority 100
+```
+
+LACP mode supports two operational modes:
+
+ - **active:** Initiates negotiation by sending LACPDUs (default)
+ - **passive:** Waits for peer to initiate negotiation
+
+> [!NOTE]
+> At least one end of the link must be in active mode for negotiation to occur.
+
+The LACP rate setting controls protocol timing:
+
+ - **slow:** LACPDUs sent every 30 seconds, with 90 second timeout (default)
+ - **fast:** LACPDUs sent every second, with 3 second timeout
+
+
+#### Link Flapping
+
+To protect against link flapping, debounce timers can be configured to
+delay link qualification.  Usually only the `up` delay is needed:
+
+```
+admin@example:/config/interface/lag0/lag/link-monitor/> edit debounce
+admin@example:/config/interface/lag0/lag/link-monitor/debounce/> set up 500
+admin@example:/config/interface/lag0/lag/link-monitor/debounce/> set down 200
+```
+
+#### Operational Status, Overview
+
+Like other interfaces, link aggregates are also available in the general
+interfaces overview in the CLI admin-exec context.  Here is the above
+static mode aggregate:
+
+```
+admin@example:/> show interfaces
+INTERFACE       PROTOCOL   STATE       DATA
+lo              ethernet   UP          00:00:00:00:00:00
+                ipv4                   127.0.0.1/8 (static)
+                ipv6                   ::1/128 (static)
+.
+.
+.
+lag0            lag        UP          static: balance-xor, hash: layer2
+│               ethernet   UP          00:a0:85:00:02:00
+├ eth7          lag        ACTIVE
+└ eth8          lag        ACTIVE
+```
+
+Same aggregate, but in LACP mode:
+
+```
+admin@example:/> show interfaces
+INTERFACE       PROTOCOL   STATE       DATA
+lo              ethernet   UP          00:00:00:00:00:00
+                ipv4                   127.0.0.1/8 (static)
+                ipv6                   ::1/128 (static)
+.
+.
+.
+lag0            lag        UP          lacp: active, rate: fast (1s), hash: layer2
+│               ethernet   UP          00:a0:85:00:02:00
+├ eth7          lag        ACTIVE      active, short_timeout, aggregating, in_sync, collecting, distributing
+└ eth8          lag        ACTIVE      active, short_timeout, aggregating, in_sync, collecting, distributing
+```
+
+
+#### Operational Status, Detail
+
+In addition to basic status shown in the interface overview, detailed
+LAG status can be inspected:
+
+```
+admin@example:/> show interfaces name lag0
+name                : lag0
+index               : 25
+mtu                 : 1500
+operational status  : up
+physical address    : 00:a0:85:00:02:00
+lag mode            : static
+lag type            : balance-xor
+lag hash            : layer2
+link debounce up    : 0 msec
+link debounce down  : 0 msec
+ipv4 addresses      :
+ipv6 addresses      :
+in-octets           : 0
+out-octets          : 2142
+```
+
+Same aggregate, but in LACP mode:
+
+```
+admin@example:/> show interfaces name lag0
+name                : lag0
+index               : 24
+mtu                 : 1500
+operational status  : up
+physical address    : 00:a0:85:00:02:00
+lag mode            : lacp
+lag hash            : layer2
+lacp mode           : active
+lacp rate           : fast (1s)
+lacp aggregate id   : 1
+lacp system priority: 65535
+lacp actor key      : 9
+lacp partner key    : 9
+lacp partner mac    : 00:a0:85:00:03:00
+link debounce up    : 0 msec
+link debounce down  : 0 msec
+ipv4 addresses      :
+ipv6 addresses      :
+in-octets           : 100892
+out-octets          : 111776
+```
+
+Member ports provide additional status information:
+
+ - Link failure counter: number of detected link failures
+ - LACP state flags: various states of LACP negotiation:
+   - `active`: port is actively sending LACPDUs
+   - `short_timeout`: using fast rate (1s) vs. slow rate (30s)
+   - `aggregating`: port is allowed to aggregate in this LAG
+   - `in_sync`: port is synchronized with partner
+   - `collecting`: port is allowed to receive traffic
+   - `distributing`: port is allowed to send traffic
+   - `defaulted`: using default partner info (partner not responding)
+   - `expired`: partner info has expired (no LACPDUs received)
+ - Aggregator ID: unique identifier for this LAG group
+ - Actor state: LACP state flags for this port (local)
+ - Partner state: LACP state flags from the remote port
+
+Example member port status:
+
+```
+admin@example:/> show interfaces name eth7
+name                : eth7
+index               : 8
+mtu                 : 1500
+operational status  : up
+physical address    : 00:a0:85:00:02:00
+lag member          : lag0
+lag member state    : active
+lacp aggregate id   : 1
+lacp actor state    : active, short_timeout, aggregating, in_sync, collecting, distributing
+lacp partner state  : active, short_timeout, aggregating, in_sync, collecting, distributing
+link failure count  : 0
+ipv4 addresses      :
+ipv6 addresses      :
+in-octets           : 473244
+out-octets          : 499037
+```
+
+
+#### Example: Switch Uplink with LACP
+
+LACP mode provides the most robust operation, automatically negotiating
+the link aggregate and detecting configuration mismatches.
+
+A common use case is connecting a switch to an upstream device:
+
+```
+admin@example:/> configure
+admin@example:/config/> edit interface lag0
+admin@example:/config/interface/lag0/> set lag mode lacp
+```
+
+Enable fast LACP for quicker fail-over:
+
+```
+admin@example:/config/interface/lag0/> set lag lacp rate fast
+```
+
+Add uplink ports
+
+```
+admin@example:/config/interface/lag0/> end
+admin@example:/config/> set interface eth7 lag-port lag lag0
+admin@example:/config/> set interface eth8 lag-port lag lag0
+```
+
+Enable protection against "link flapping".
+
+```
+admin@example:/config/interface/lag0/> edit lag link-monitor
+admin@example:/config/interface/lag0/lag/link-monitor/> edit debounce
+admin@example:/config/interface/lag0/lag/link-monitor/debounce/> set up 500
+admin@example:/config/interface/lag0/lag/link-monitor/debounce/> set down 200
+admin@example:/config/interface/lag0/lag/link-monitor/debounce/> top
+```
+
+Add to bridge for switching
+
+```
+admin@example:/config/interface/lag0/lag/link-monitor/debounce/> end
+admin@example:/config/> set interface lag0 bridge-port bridge br0
+admin@example:/config/> leave
+```
+
+
 ### VLAN Interfaces

-Creating a VLAN can be done in many ways. This section assumes VLAN
+Creating a VLAN can be done in many ways.  This section assumes VLAN
 interfaces created atop another Linux interface.  E.g., the VLAN
 interfaces created on top of the Ethernet interface or bridge in the
 picture below.
@@ -425,7 +731,9 @@ As conventions, a VLAN interface for VID 20 on top of an Ethernet
 interface *eth0* is named *eth0.20*, and a VLAN interface for VID 10 on
 top of a bridge interface *br0* is named *vlan10*.

-> **Note:** If you name your VLAN interface `foo0.N` or `vlanN`, where `N` is a number, Infix will set the interface type automatically for you.
+> [!NOTE]
+> If you name your VLAN interface `foo0.N` or `vlanN`, where `N` is a
+> number, the CLI infers the interface type automatically.


 ### Physical Ethernet Interfaces
@@ -484,9 +792,10 @@ Auto-negotiation of speed/duplex mode is desired in almost all
 use-cases, but it is possible to disable auto-negotiation and specify
 a fixed speed and duplex mode.

-> If setting a fixed speed and duplex mode, ensure both sides of the
-> link have matching configuration. If speed does not match, the link
-> will not come up. If duplex mode does not match, the result is
+> [!IMPORTANT]
+> When setting a fixed speed and duplex mode, ensure both sides of the
+> link have matching configuration.  If speed does not match, the link
+> will not come up.  If duplex mode does not match, the result is
 > reported collisions and/or bad throughput.

 The example below configures port eth3 to fixed speed 100 Mbit/s
@@ -579,9 +888,10 @@ interfaces {
 admin@example:/config/>
 ```

-> **Note:** this is another example of the automatic inference of the
-> interface type from the name.  Any name can be used, but then you have
-> to set the interface type to `veth` manually.
+> [!TIP]
+> This is another example of the automatic inference of the interface
+> type from the name.  Any name can be used, but then you have to set
+> the interface type to `veth` manually.


 ## Management Plane
@@ -589,7 +899,8 @@ admin@example:/config/>
 This section details IP Addresses And Other Per-Interface IP settings.

 Infix support several network interface types, each can be assigned one
-or more IP addresses, both IPv4 and IPv6 are supported.
+or more IP addresses, both IPv4 and IPv6 are supported.  (There is no
+concept of a "primary" address.)

 ![IP on top of network interface examples](img/ip-iface-examples.svg)

@@ -603,7 +914,8 @@ Multiple address assignment methods are available:
 | link-local | infix-ip          | Auto-assignment of IPv4 address in 169.254.x.x/16 range        |
 | dhcp       | infix-dhcp-client | Assignment of IPv4 address by DHCP server, e.g., *10.0.1.1/24* |

-> **Note:** DHCP address method is only available for *LAN* interfaces
+> [!NOTE]
+> The DHCP address method is only available for *LAN* interfaces
 > (Ethernet, virtual Ethernet (veth), bridge, link aggregates, etc.)

 Supported DHCP (request) options, configurability (Cfg) and defaults,
@@ -611,35 +923,36 @@ are listed below.  Configurable options can be disabled on a per client
 interface basis, some options, like `clientid` and option 81, are
 possible to set the value of as well.

-| **Opt** | **Name**         | **Cfg** | **Description**                                     |
-|---------|------------------|---------|-----------------------------------------------------|
-| 1       | `subnet`         | No      | Request IP address and netmask                      |
-| 3       | `router`         | Yes     | Default route(s), see also option 121 and 249       |
-| 6       | `dns`            | Yes     | DNS server(s), static ones take precedence          |
-| 12      | `hostname`       | Yes     | DHCP cannot set hostname, only for informing server |
-| 15      | `domain`         | Yes     | Default domain name, for name resolution            |
-| 28      | `broadcast`      | Yes     | Broadcast address, calculated if disabled           |
-| 42      | `ntpsrv`         | Yes     | NTP server(s), static ones take precedence          |
-| 50      | `address`        | Yes     | Request (previously cached) address                 |
-| 61      | `clientid`       | Yes     | Default MAC address (and option 12)                 |
-| 81      | `fqdn`           | Yes     | Similar to option 12, request FQDN update in DNS    |
-| 119     | `search`         | Yes     | Request domain search list                          |
-| 121     | `staticroutes`   | Yes     | Classless static routes                             |
-| 249     | `msstaticroutes` | Yes     | Microsoft static route                              |
-|         |                  |         |                                                     |
+| **Opt** | **Name**                    | **Cfg** | **Description**                                     |
+|---------|-----------------------------|---------|-----------------------------------------------------|
+| 1       | `netmask`                   | No      | Request IP address and netmask                      |
+| 3       | `router`                    | Yes     | Default route(s), see also option 121 and 249       |
+| 6       | `dns-server`                | Yes     | DNS server(s), static ones take precedence          |
+| 12      | `hostname`                  | Yes     | DHCP cannot set hostname, only for informing server |
+| 15      | `domain`                    | Yes     | Default domain name, for name resolution            |
+| 28      | `broadcast`                 | Yes     | Broadcast address, calculated if disabled           |
+| 42      | `ntp-server`                | Yes     | NTP server(s), static ones take precedence          |
+| 50      | `address`                   | Yes     | Request (previously cached) address                 |
+| 61      | `client-id`                 | Yes     | Default MAC address (and option 12)                 |
+| 81      | `fqdn`                      | Yes     | Similar to option 12, request FQDN update in DNS    |
+| 119     | `search`                    | Yes     | Request domain search list                          |
+| 121     | `classless-static-route`    | Yes     | Classless static routes                             |
+| 249     | `ms-classless-static-route` | Yes     | Microsoft static route, same as option 121          |
+|         |                             |         |                                                     |

-**Default:** `router`, `dns`, `domain`, `broadcast`, `ntpsrv`, `search`,
-             `address`, `staticroutes`, `msstaticroutes`
+**Default:** `router`, `dns-server`, `domain`, `broadcast`, `ntp-server`, `search`,
+             `address`, `classless-static-route`, `ms-classless-static-route`

 When configuring a DHCP client, ensure that the NTP client is enabled
-for the `ntpsrv` DHCP option to be processed correctly. If the NTP
+for the `ntp-server` DHCP option to be processed correctly.  If the NTP
 client is not enabled, any NTP servers provided by the DHCP server will
-be ignored. For details on how to enable the NTP client, see the 
-[NTP Client Configuration](system.md#ntp-client-configuration) section.
+be ignored. For details on how to enable the NTP client, see the [NTP
+Client Configuration](system.md#ntp-client-configuration) section.

-> **Note:** as per [RFC3442][4], if the DHCP server returns both a
-> Classless Static Routes option (121) and Router option (3), the
-> DHCP client *must* ignore the latter.
+> [!IMPORTANT]
+> Per [RFC3442][4], if the DHCP server returns both a Classless Static
+> Routes option (121) and Router option (3), the DHCP client *must*
+> ignore the latter.


 ### IPv6 Address Assignment
@@ -727,7 +1040,6 @@ will be used, otherwise it falls back to the default algorithm.
    admin@example:/> configure
    admin@example:/config/> edit dhcp-client
    admin@example:/config/dhcp-client/> set client-if eth0
-    admin@example:/config/dhcp-client/> set enabled true
    admin@example:/config/dhcp-client/> leave
    admin@example:/> show interfaces
    INTERFACE       PROTOCOL   STATE       DATA
@@ -747,7 +1059,7 @@ The resulting address (10.1.2.100/24) is of type *dhcp*.
 The (only) way to disable IPv6 link-local addresses is by disabling IPv6
 on the interface.

-```(disabling
+```
 admin@example:/> configure
 admin@example:/config/> edit interface eth0 ipv6
 admin@example:/config/interface/eth0/ipv6/> set enabled false
@@ -861,33 +1173,38 @@ have changed type to *random*.
 To be able to route (static or dynamic) on the interface it is
 required to enable forwarding. This setting controls if packets
 received on this interface can be forwarded.
-   ```
-   admin@example:/config/> edit interface eth0
-   admin@example:/config/interface/eth0/> set ipv4 forwarding
-   admin@example:/config/interface/eth0/> leave
-   admin@example:/>
-   ```
+
+```
+admin@example:/config/> edit interface eth0
+admin@example:/config/interface/eth0/> set ipv4 forwarding
+admin@example:/config/interface/eth0/> leave
+admin@example:/>
+```


 ### IPv6 forwarding

-This flag behaves totally different than for IPv4. For IPv6 the
-ability to route between interfaces is always enabled, instead this
-flag controls if the interface will be in host/router mode.
+Due to how the Linux kernel manages IPv6 forwarding, we can not fully
+control it per interface via this setting like how IPv4 works.  Instead,
+IPv6 forwarding is globally enabled when at least one interface enable
+forwarding, otherwise it is disabled.

-| **Feature**                              | **Forward enabled** | **Forward disabled** |
-|:-----------------------------------------|:--------------------|:---------------------|
-| IsRouter set in Neighbour Advertisements | Yes                 | No                   |
-| Transmit Router Solicitations            | No                  | Yes                  |
-| Router Advertisements are ignored        | No                  | Yes                  |
-| Accept Redirects                         | No                  | Yes                  |
+The following table shows the system IPv6 features that the `forwarding`
+setting control when it is *Enabled* or *Disabled:

-   ```
-   admin@example:/config/> edit interface eth0
-   admin@example:/config/interface/eth0/> set ipv6 forwarding
-   admin@example:/config/interface/eth0/> leave
-   admin@example:/>
-   ```
+| **IPv6 Feature**                         | **Enabled** | **Disabled** |
+|:-----------------------------------------|:------------|:-------------|
+| IsRouter set in Neighbour Advertisements | Yes         | No           |
+| Transmit Router Solicitations            | No          | Yes          |
+| Router Advertisements are ignored        | Yes         | Yes          |
+| Accept Redirects                         | No          | Yes          |
+
+```
+admin@example:/config/> edit interface eth0
+admin@example:/config/interface/eth0/> set ipv6 forwarding
+admin@example:/config/interface/eth0/> leave
+admin@example:/>
+```


 ## Routing support
@@ -906,9 +1223,10 @@ The base model, ietf-routing, is where all the other models hook in.  It
 is used to set configuration and read operational status (RIB tables) in
 the other models.

-> **Note:** the standard IETF routing models allows multiple instances,
-> but Infix currently *only support one instance* per routing protocol!
-> In the examples presented here, the instance name `default` is used.
+> [!NOTE]
+> The standard IETF routing models allows multiple instances, but Infix
+> currently *only support one instance* per routing protocol!  In the
+> examples presented here, the instance name `default` is used.


 ### IPv4 Static routes
@@ -934,6 +1252,7 @@ router 192.168.1.1, using the highest possible distance:
    admin@example:/config/routing/control-plane-protocol/static/name/default/> leave
    admin@example:/>

+> [!TIP]
 > Remember to enable [IPv4 forwarding](#IPv4-forwarding) for the
 > interfaces you want to route between.

@@ -957,6 +1276,7 @@ enable OSPF and set one active interface in area 0:
    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> leave
    admin@example:/>

+> [!TIP]
 > Remember to enable [IPv4 forwarding](#IPv4-forwarding) for all the
 > interfaces you want to route between.

@@ -1011,6 +1331,38 @@ an Ethernet interface can be done as follows.
    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/area/0.0.0.0/interface/e0/> set interface-type point-to-point
    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/area/0.0.0.0/interface/e0/>

+#### OSPF global settings
+
+In addition to *area* and *interface* specific settings, OSPF provides
+global settings for route redistribution and OSPF router identifier.
+
+```
+admin@example:/config/> edit routing control-plane-protocol ospfv2 name default ospf
+admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/> set ?
+  area                     List of OSPF areas.
+  default-route-advertise  Distribute default route to network
+  explicit-router-id       Defined in RFC 2328.  A 32-bit number
+  redistribute             Redistribute protocols into OSPF
+admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/> set
+```
+
+- Explicit router ID: By default the router will pick an IP address
+  from one of its OSPF interfaces as OSPF router ID. An explicit ID is
+  used to get a deterministic behavior, e.g., `set explicit-router-id
+  1.1.1.1`.
+- Redistribution: `set redistribute static` and `set redistribute connected`
+  can be used to include static or connected routes into the OSPF routing
+  domain. These routes are redistributed as *external type-2* (E2)
+  routes.
+- Advertising default route: An OSPF router can be made to distribute
+  a default route into the OSPF domain by command `set
+  default-route-advertise enabled`. This route is distributed as long
+  as the router itself has an *active* default route in its routing
+  table. By adding command `set default-route-advertise always` the
+  router will distribute a default route even when it lacks a default
+  route. The default route will be distributed as an *external type-2*
+  (E2) route.
+

 #### Debug OSPFv2

@@ -1113,10 +1465,11 @@ different next-hop, learned from a DHCP server wins over an OSPF route.
 The distance used for static routes and DHCP routes can be changed by
 setting a different *routing preference* value.

-> **Note:** the kernel metric is an unsigned 32-bit value, which is read
-> by Frr as (upper) 8 bits distance and 24 bits metric.  But it does not
-> write it back to the kernel FIB this way, only selected routes are
-> candidates to be installed in the FIB by Frr.
+> [!NOTE]
+> The kernel metric is an unsigned 32-bit value, which is read by Frr as
+> (upper) 8 bits distance and 24 bits metric.  But it does not write it
+> back to the kernel FIB this way, only selected routes are candidates
+> to be installed in the FIB by Frr.


 #### Source protocol
@@ -1139,7 +1492,7 @@ currently supported, namely `ipv4` and `ipv6`.
 [4]: https://www.rfc-editor.org/rfc/rfc3442
 [0]: https://frrouting.org/

-[^1]: Please note, link aggregates are not yet supported in Infix.
+[^1]: `(source MAC XOR destination MAC XOR EtherType) MODULO num_links`
 [^2]: Link-local IPv6 addresses are implicitly enabled when enabling
    IPv6.  IPv6 can be enabled/disabled per interface in the
    [ietf-ip][2] YANG model.
@@ -1150,11 +1503,10 @@ currently supported, namely `ipv4` and `ipv6`.
 [^4]: A YANG deviation was previously used to make it possible to set
    `phys-address`, but this has been replaced with the more flexible
 	`custom-phys-address`.
-[^5]: Infix MAC bridges on Marvell Linkstreet devices are currently
-    limited to use a single MAC database, causing issues if the same
-    MAC address appears on different MAC bridges.
-[^6]: Ethernet counters are described in
-    *ieee802-ethernet-interface.yang* and
-    *infix-ethernet-interface.yang*. [Ethernet
-    Counters](eth-counters.md) page provides additional details on
-    statistics support.
+[^5]: MAC bridges on Marvell Linkstreet devices are currently limited to
+    a single MAC database, this may be a problem if the same MAC address
+    appears in different MAC bridges.
+[^6]: Ethernet counters are described in *ieee802-ethernet-interface.yang*
+    and *infix-ethernet-interface.yang*.  There is a dedicated document on
+    [Ethernet Counters](eth-counters.md) that provide additional details
+    on the statistics support.
@@ -92,7 +92,7 @@ Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
 Warning: Permanently added 'fe80::ff:fe00:0%eth0' (ED25519) to the list of known hosts.
 admin@fe80::ff:fe00:0%eth0's password: *****
 .-------.
-|  . .  | Infix -- a Network Operating System
+|  . .  | Infix OS — Immutable.Friendly.Secure
 |-. v .-| https://kernelkit.org
 '-'---'-'

@@ -653,6 +653,70 @@ on interface *e0*.
 ~$ 
 ```

+### Change a Binary Setting
+
+A YANG `binary` type setting is Base64 encoded and requires a little bit
+more tricks.  We take the opportunity to showcase a shell script helper:
+`/usr/bin/text-editor`, which works just like the `text-editor` command
+in the CLI, but this one takes an XPath argument to the binary leaf to
+edit.
+
+Stripped down, it looks something like this:
+
+```bash
+if tmp=$(sysrepocfg -G "$xpath"); then
+    file=$(mktemp)
+
+	echo "$tmp" | base64 -d > "$file"
+	if edit "$file"; then
+		tmp=$(base64 -w0 < "$file")
+		sysrepocfg -S "$xpath" -u "$tmp"
+	fi
+
+	rm -f "$file"
+else
+	echo "Failed to retrieve value for $xpath"
+	exit 1
+fi
+```
+
+An example container configuration, with an embedded file that is
+mounted to `/var/www/index.html` can look like this:
+
+```json
+  "infix-containers:containers": {
+    "container": [
+      {
+        "name": "web",
+        "image": "oci-archive:/lib/oci/curios-httpd-latest.tar.gz",
+        "hostname": "web",
+        "network": {
+          "interface": [
+            {
+              "name": "veth-sys0"
+            }
+          ]
+        },
+        "mount": [
+          {
+            "name": "index.html",
+            "content": "PCFET0NUWVBFIGh0bWwjibberish.shortened.down==",
+            "target": "/var/www/index.html"
+          }
+        ]
+      }
+    ]
+  }
+``` 
+
+The command to edit this file, and restart the container with the new
+contents, look like this:
+
+```
+admin@infix:~$ cfg edit "/infix-containers:containers/container[name='web']/mount[name='index.html']/content"
+```
+
+
 ### <a id="backup"></a> Backup Configuration Using sysrepocfg And scp 

 Displaying running or startup configuration is possible with
@@ -789,14 +853,18 @@ models for details.
 ### Factory Reset

 ```
-~$ curl -kX POST -H "Content-Type: application/yang-data+json" https://example.local/restconf/operations/ietf-factory-default:factory-reset -u admin:admin
+~$ curl -kX POST -u admin:admin \
+        -H "Content-Type: application/yang-data+json" \
+		https://example.local/restconf/operations/ietf-factory-default:factory-reset
 curl: (56) OpenSSL SSL_read: error:0A000126:SSL routines::unexpected eof while reading, errno 0
 ```

 ### System Reboot

 ```
-~$ curl -kX POST -H "Content-Type: application/yang-data+json" https://example.local/restconf/operations/ietf-system:system-restart -u admin:admin
+~$ curl -kX POST -u admin:admin \
+        -H "Content-Type: application/yang-data+json" \
+		https://example.local/restconf/operations/ietf-system:system-restart
 ```

 ### Set Date and Time
@@ -804,7 +872,11 @@ curl: (56) OpenSSL SSL_read: error:0A000126:SSL routines::unexpected eof while r
 Here's an example of an RPC that takes input/argument:

 ```
-~$ curl -kX POST -H "Content-Type: application/yang-data+json" https://example.local/restconf/operations/ietf-system:set-current-datetime -u admin:admin -d '{"ietf-system:input": {"current-datetime": "2024-04-17T13:48:02-01:00"}}'
+~$ curl -kX POST -u admin:admin \
+	    -H "Content-Type: application/yang-data+json" \
+	    -d '{"ietf-system:input": {"current-datetime": "2024-04-17T13:48:02-01:00"}}' \
+		https://example.local/restconf/operations/ietf-system:set-current-datetime
+
 ```

 You can verify that the changes took by a remote SSH command:
@@ -815,6 +887,51 @@ Wed Apr 17 14:48:12 UTC 2024
 ~$
 ```

+### Read Hostname
+
+Example of fetching JSON configuration data to stdout:
+
+```
+~$ curl -kX GET -u admin:admin \
+        -H 'Accept: application/yang-data+json' \
+		https://example.local/restconf/data/ietf-system:system/hostname
+{
+  "ietf-system:system": {
+    "hostname": "foo"
+  }
+}
+```
+
+### Set Hostname
+
+Example of inline JSON data:
+
+```
+~$ curl -kX PATCH -u admin:admin \
+     -H 'Content-Type: application/yang-data+json' \
+     -d '{"ietf-system:system":{"hostname":"bar"}}' \
+     https://example.local/restconf/data/ietf-system:system
+```
+
+### Copy Running to Startup
+
+No copy command available yet to copy between datastores, and the
+Rousette back-end also does not support "write-through" to the
+startup datastore.
+
+To save running-config to startup-config, use the following example to
+fetch running to a local file and then update startup with it:
+
+```
+~$ curl -kX GET -u admin:admin -o running-config.json \
+        -H 'Accept: application/yang-data+json'       \
+         https://example.local/restconf/ds/ietf-datastores:running
+
+~$ curl -kX PUT -u admin:admin -d @running-config.json \
+        -H 'Content-Type: application/yang-data+json'  \
+        https://example.local/restconf/ds/ietf-datastores:startup
+```
+

 ## Miscellaneous

@@ -1146,7 +1263,7 @@ It should now be possible to access the switch from the PC via SSH (or NETCONF).
 ~ $ ssh admin@fe80::0053:00ff:fe06:1101%eth1
 admin@fe80::0053:00ff:fe06:1101%eth1's password: 
 .-------.
-|  . .  | Infix -- a Network Operating System
+|  . .  | Infix OS — Immutable.Friendly.Secure
 |-. v .-| https://kernelkit.org
 '-'---'-'

@@ -11,9 +11,10 @@ specific string followed by the last three octets of the system base MAC
 address, e.g., `switch-12-34-56`.  An example of how to change the
 hostname is included below.

-> **Note:** when issuing `leave` to activate your changes, remember to
-> also save your settings, `copy running-config startup-config`.  See
-> the [CLI Introduction](cli/introduction.md) for a background.
+> [!NOTE]
+> When issuing `leave` to activate your changes, remember to also save
+> your settings, `copy running-config startup-config`.  See the [CLI
+> Introduction](cli/introduction.md) for a background.


 ## Changing Password
@@ -24,14 +25,14 @@ available in the system authentication configuration context.
 ```
 admin@host:/config/> edit system authentication user admin
 admin@host:/config/system/authentication/user/admin/> change password
-New password: 
-Retype password: 
+New password:
+Retype password:
 admin@host:/config/system/authentication/user/admin/> leave
 ```

 The `change password` command starts an interactive dialogue that asks
 for the new password, with a confirmation, and then salts and encrypts
-the password with sha512crypt. 
+the password with sha512crypt.

 It is also possible to use the `set password ...` command.  This allows
 setting an already hashed password.  To manually hash a password, use
@@ -39,7 +40,8 @@ the `do password encrypt` command.  This launches the admin-exec command
 to hash, and optionally salt, your password.  This encrypted string can
 then be used with `set password ...`.

-> **Tip:** if you are having trouble thinking of a password, Infix has a
+> [!TIP]
+> If you are having trouble thinking of a password, there is a nifty
 > `password generate` command in admin-exec context which generates
 > random passwords using the UNIX command `pwgen`.  Use the `do` prefix
 > when inside any configuration context to access admin-exec commands.
@@ -55,7 +57,7 @@ With SSH keys in place it is possible to disable password login, just
 remember to verify SSH login and network connectivity before doing so.

 ```
-admin@host:/config/> edit system authentication user admin 
+admin@host:/config/> edit system authentication user admin
 admin@host:/config/system/authentication/user/admin/> edit authorized-key example@host
 admin@host:/config/system/authentication/user/admin/authorized-key/example@host/> set algorithm ssh-rsa
 admin@host:/config/system/authentication/user/admin/authorized-key/example@host/> set key-data AAAAB3NzaC1yc2EAAAADAQABAAABgQC8iBL42yeMBioFay7lty1C4ZDTHcHyo739gc91rTTH8SKvAE4g8Rr97KOz/8PFtOObBrE9G21K7d6UBuPqmd0RUF2CkXXN/eN2PBSHJ50YprRFt/z/304bsBYkDdflKlPDjuSmZ/+OMp4pTsq0R0eNFlX9wcwxEzooIb7VPEdvWE7AYoBRUdf41u3KBHuvjGd1M6QYJtbFLQMMTiVe5IUfyVSZ1RCxEyAB9fR9CBhtVheTVsY3iG0fZc9eCEo89ErDgtGUTJK4Hxt5yCNwI88YaVmkE85cNtw8YwubWQL3/tGZHfbbQ0fynfB4kWNloyRHFr7E1kDxuX5+pbv26EqRdcOVGucNn7hnGU6C1+ejLWdBD7vgsoilFrEaBWF41elJEPKDzpszEijQ9gTrrWeYOQ+x++lvmOdssDu4KvGmj2K/MQTL2jJYrMJ7GDzsUu3XikChRL7zNfS2jYYQLzovboUCgqfPUsVba9hqeX3U67GsJo+hy5MG9RSry4+ucHs=
@@ -65,9 +67,10 @@ key-data AAAAB3NzaC1yc2EAAAADAQABAAABgQC8iBL42yeMBioFay7lty1C4ZDTHcHyo739gc91rTT
 admin@host:/config/system/authentication/user/admin/authorized-key/example@host/> leave
 ```

-> **Note:** the `ssh-keygen` program already base64 encodes the public
-> key data, so there is no need to use the `text-editor` command, `set`
-> does the job.
+> [!NOTE]
+> The `ssh-keygen` program already base64 encodes the public key data,
+> so there is no need to use the `text-editor` command, `set` does the
+> job.


 ## Multiple Users
@@ -145,7 +148,7 @@ is committed by issuing the `leave` command.
 admin@host:/config/> edit system
 admin@host:/config/system/> set hostname example
 admin@host:/config/system/> leave
-admin@host:/> 
+admin@example:/>
 ```

 The hostname is advertised over mDNS-SD in the `.local` domain.  If
@@ -154,8 +157,24 @@ case, mDNS will advertise a "uniqified" variant, usually suffixing with
 an index, e.g., `example-1.local`.  Use an mDNS browser to scan for
 available devices on your LAN.

-> **Note:** critical services like syslog, mDNS, LLDP, and similar that
-> advertise the hostname, are restarted when the hostname is changed.
+In some cases you may want to set the device's *domain name* as well.
+This is handled the same way:
+
+```
+admin@host:/config/> edit system
+admin@host:/config/system/> set hostname foo.example.com
+admin@host:/config/system/> leave
+admin@foo:/>
+```
+
+Both host and domain name are stored in the system files `/etc/hosts`
+and `/etc/hostname`.  The latter is exclusively for the host name.  The
+domain *may* be used by the system DHCP server when handing out leases
+to clients, it is up to the clients to request the domain name *option*.
+
+> [!NOTE]
+> Critical services like syslog, mDNS, LLDP, and similar that advertise
+> the hostname, are restarted when the hostname is changed.


 ## Changing Login Banner
@@ -164,8 +183,9 @@ The `motd-banner` setting is an Infix augment and an example of a
 `binary` type setting that can be changed interactively with the
 built-in [`text-editor` command](cli/text-editor.md).

-> **Tip:** see the next section for how to change the editor used
-> to something you may be more familiar with.
+> [!TIP]
+> See the next section for how to change the editor used to something
+> you may be more familiar with.

 ```
 admin@host:/config/> edit system
@@ -196,43 +216,90 @@ admin@host:/config/system/> leave
 admin@host:/>
 ```

-> **Note:** as usual, configuration changes only take effect after
-> issuing the `leave` command.  I.e., you must change the editor first,
-> and then re-enter configure context to use your editor of choice.
+> [!IMPORTANT]
+> Configuration changes only take effect after issuing the `leave`
+> command.  I.e., you must change the editor first, and then re-enter
+> configure context to use your editor of choice.
+
+
+## DNS Resolver Configuration
+
+The system supports both static and dynamic (DHCP) DNS setup.  The
+locally configured (static) server is preferred over any acquired
+from a DHCP client.
+
+```
+admin@host:/> configure
+admin@host:/config/> edit system dns-resolver
+admin@host:/config/system/dns-resolver/> set server google udp-and-tcp address 8.8.8.8
+admin@host:/config/system/dns-resolver/> show
+server google {
+  udp-and-tcp {
+    address 8.8.8.8;
+  }
+}
+admin@host:/config/system/dns-resolver/> leave
+```
+
+It is also possible to configure resolver options like timeout and
+retry attempts.  See the YANG model for details, or use the built-in
+help system in the CLI.
+
+> [!NOTE]
+> When acting as a DHCP server and DNS proxy for other devices, any
+> local DNS server configured here is automatically used as upstream DNS
+> server.


 ## NTP Client Configuration

-Below is an example configuration for enabling NTP 
-with a specific server and the `iburst` option for faster initial 
-synchronization.
+Below is an example configuration for enabling NTP with a specific
+server and the `iburst` option for faster initial synchronization.

 ```
 admin@host:/> configure
-admin@host:/config/> set system ntp enabled
-admin@host:/config/> set system ntp server ntp-pool
-admin@host:/config/> set system ntp server ntp-pool udp address pool.ntp.org
-admin@host:/config/> set system ntp server ntp-pool iburst
-admin@host:/config/> set system ntp server ntp-pool prefer
+admin@host:/config/> edit system ntp
+admin@host:/config/system/ntp/> set enabled
+admin@host:/config/system/ntp/> set server ntp-pool
+admin@host:/config/system/ntp/> set server ntp-pool udp address pool.ntp.org
+admin@host:/config/system/ntp/> set server ntp-pool iburst
+admin@host:/config/system/ntp/> set server ntp-pool prefer
+admin@host:/config/system/ntp/> leave
 ```

-This configuration enables the NTP client and sets the NTP server to 
-`pool.ntp.org` with the `iburst` and `prefer` options. The `iburst` 
-option ensures faster initial synchronization, and the `prefer` option 
+This configuration enables the NTP client and sets the NTP server to
+`pool.ntp.org` with the `iburst` and `prefer` options. The `iburst`
+option ensures faster initial synchronization, and the `prefer` option
 designates this server as preferred.

 * `prefer false`: The NTP client will choose the best available source
-based on several factors, such as network delay, stratum, and other 
+based on several factors, such as network delay, stratum, and other
 metrics (default config).
-* `prefer true`: The NTP client will try to use the preferred server 
+* `prefer true`: The NTP client will try to use the preferred server
 as the primary source unless it becomes unreachable or unusable.

+
+### Show NTP Sources
+
+The status for NTP sources is availble in YANG and accessable with
+CLI/NETCONF/RESTCONF.
+
+To view the sources being used by the NTP client, run:
+```
+admin@target:/> show ntp
+ADDRESS         MODE         STATE            STRATUM POLL-INTERVAL
+192.168.1.1     server       candidate              1             6
+192.168.2.1     server       candidate              1             6
+192.168.3.1     server       selected               1             6
+```
+
 ### Show NTP Status

-To check the status of NTP synchronization, use the following command:
+To check the status of NTP synchronization (only availble in CLI), use
+the following command:

 ```
-admin@host:/> show ntp
+admin@host:/> show ntp tracking
 Reference ID    : C0248F86 (192.36.143.134)
 Stratum         : 2
 Ref time (UTC)  : Mon Oct 21 10:06:45 2024
@@ -249,34 +316,446 @@ Leap status     : Normal
 admin@host:/>
 ```

-This output provides detailed information about the NTP status, including 
+This output provides detailed information about the NTP status, including
 reference ID, stratum, time offsets, frequency, and root delay.

-### Show NTP Sources
+> [!TIP]
+> The system uses `chronyd` Network Time Protocol (NTP) daemon.  The
+> output shown here is best explained in the [Chrony documentation][4].

-To view the sources being used by the NTP client, run:
+## Upgrade procedures and boot order
+
+For resilience purposes, Infix maintains two software
+images referred to as the _primary_ and _secondary_ partition image.
+In addition, some bootloaders support [netbooting][6].
+
+The _boot order_ defines which image is tried first, and is listed
+with the CLI `show software` command. It also shows Infix version
+installed per partition, and which image was used when booting (`STATE
+booted`).

 ```
-admin@host:/> show ntp sources 
+admin@example:/> show software
+BOOT ORDER
+primary secondary net

-  .-- Source mode  '^' = server, '=' = peer, '#' = local clock.
- / .- Source state '*' = current best, '+' = combined, '-' = not combined,
-| /             'x' = may be in error, '~' = too variable, '?' = unusable.
-||                                                 .- xxxx [ yyyy ] +/- zzzz
-||      Reachability register (octal) -.           |  xxxx = adjusted offset,
-||      Log2(Polling interval) --.      |          |  yyyy = measured offset,
-||                                \     |          |  zzzz = estimated error.
-||                                 |    |           \
-MS Name/IP address         Stratum Poll Reach LastRx Last sample               
-===============================================================================
-^* 192.36.143.134                1   6   177     9   +278ms[ -3845s] +/-  514ms
-admin@host:/>
+NAME      STATE     VERSION                DATE
+primary   booted    v25.01.0               2025-04-25T10:15:00+00:00
+secondary inactive  v25.01.0               2025-04-25T10:07:20+00:00
+admin@example:/>
 ```

-> The system uses `chronyd` for Network Time Protocol (NTP)
-> synchronization. The output shown here is best explained in the
-> [Chrony documentation](https://chrony-project.org/doc/4.6.1/chronyc.html).
+YANG support for upgrading Infix, inspecting and _modifying_ the
+boot-order, is defined in [infix-system-software][5].
+
+
+### Upgrading Infix
+
+Upgrading Infix is done one partition at a time. If the system has
+booted from one partition, an `upgrade` will apply to the other
+(inactive) partition.
+
+1. Download and unpack the release to install. Make the image *pkg*
+   bundle available at some URL[^10]
+2. (Optional) Backup the startup configuration
+3. Assume the unit has booted the `primary` image. Then running the
+   `upgrade` command installs a new image on the `secondary`
+   partition
+4. As part of a successful upgrade, the boot-order is implictly
+   changed to boot the newly installed image
+5. Reboot the unit
+6. The unit now runs the new image. To upgrade the remaining partition
+   (`primary`), run the same upgrade command again, and (optionally)
+   reboot to verify the upgrade
+   
+> [!CAUTION]
+> During boot (step 5), the unit may
+> [migrate](#configuration-migration) the startup configuration for
+> any syntax changes.  It is therefore important that you make sure to
+> upgrade the other partition as well after reboot, of course after
+> having verified your setup.
+
+The CLI example below shows steps 2-5.
+
+*Backup startup configuration:* It is recommended to backup the
+startup configuration before performing an upgrade. The backup is
+useful if the upgrade fails, and makes a later
+[downgrade](#downgrading-infix) smoother to conduct.
+
+```
+admin@example:/> dir /cfg
+/cfg directory
+backup/             ssl/                startup-config.cfg
+
+admin@example:/> copy /cfg/startup-config.cfg /cfg/v25.01.0-startup-config.cfg
+admin@example:/> dir /cfg
+/cfg directory
+backup/             ssl/                startup-config.cfg           v25.01.0-startup-config.cfg
+
+admin@example:/> 
+```
+
+*Upgrade:* Here the image *pkg bundle* was made available via TFTP.
+
+```
+admin@example:/> upgrade tftp://198.18.117.1/infix-aarch64-25.03.1.pkg
+installing
+  0% Installing
+  0% Determining slot states
+ 10% Determining slot states done.
+...
+ 98% Copying image to rootfs.1
+ 99% Copying image to rootfs.1
+ 99% Copying image to rootfs.1 done.
+ 99% Updating slots done.
+100% Installing done.
+Installing `tftp://198.18.117.1/infix-aarch64-25.03.1.pkg` succeeded
+admin@example:/>
+```
+
+*Reboot:* The unit will boot on the other partition, with the newly
+installed image. The `Loading startup-config` step conducts migration
+of startup configuration if applicable.
+
+```
+admin@example:/> reboot
+[ OK ] Stopping Static routing daemon
+[ OK ] Stopping Zebra routing daemon
+...
+[ OK ] Loading startup-config
+[ OK ] Verifying self-signed https certificate
+[ OK ] Update DNS configuration
+[ OK ] Starting Status daemon
+
+Infix OS — Immutable.Friendly.Secure v25.03.1 (ttyS0)
+example login: admin
+Password:
+.-------.
+|  . .  | Infix OS — Immutable.Friendly.Secure
+|-. v .-| https://kernelkit.org
+'-'---'-'
+
+Run the command 'cli' for interactive OAM
+
+admin@example:~$ cli
+
+See the 'help' command for an introduction to the system
+
+admin@example:/> show software
+BOOT ORDER
+secondary primary net
+
+NAME      STATE     VERSION                DATE
+primary   inactive  v25.01.0               2025-04-25T10:15:00+00:00
+secondary booted    v25.03.1               2025-04-25T10:24:31+00:00
+admin@example:/>
+```
+
+As shown, the *boot order* has been updated, so that *secondary* is
+now the preferred boot source.
+
+To upgrade the remaining partition (`primary`), run the `upgrade URL`
+command again, and (optionally) reboot.
+
+### Configuration Migration
+
+The example above illustrated an upgrade from Infix v25.01.0 to
+v25.03.1. Inbetween these versions, YANG configuration definitions
+changed slightly (more details given below).
+
+During boot, Infix inspects the `version` meta information within the
+startup configuration file to determine if configuration migration is
+needed. In this specific case, the configuration file has version
+`1.4` while the booted software expects version `1.5` (the
+configuration version numbering differs from the Infix image version
+numbering).  The startup configuration is migrated to `1.5`
+definitions and stored, while a backup previous startup configuration
+is stored in directory `/cfg/backup/`.
+
+```
+admin@example:/> dir /cfg/backup/
+/cfg/backup/ directory
+startup-config-1.4.cfg
+
+admin@example:/>
+```
+
+The modifications made to the startup configuration can be viewed by
+comparing the files from the *shell*. An example is shown below.
+
+```
+admin@example:/> exit
+admin@example:~$ diff /cfg/backup/startup-config-1.4.cfg /cfg/startup-config.cfg
+--- /cfg/backup/startup-config-1.4.cfg
+++ /cfg/startup-config.cfg
+...
+-          "public-key-format": "ietf-crypto-types:ssh-public-key-format",
+          "public-key-format": "infix-crypto-types:ssh-public-key-format",
+...
+-          "private-key-format": "ietf-crypto-types:rsa-private-key-format",
+          "private-key-format": "infix-crypto-types:rsa-private-key-format",
+...
+-    "version": "1.4"
+    "version": "1.5"
+...
+admin@example:~$
+```
+
+### Downgrading Infix
+
+Downgrading to an earlier Infix version is possible, however,
+downgrading is **not** guaranteed to work smoothly. In particular,
+when the unit boots up with the downgraded version, it may fail to
+apply the *startup config*, and instead apply its [failure config][7].
+
+We consider two cases: downgrading with or without applying a backup
+startup configuration before rebooting.
+
+In both cases we start out with a unit running Infix v25.03.1, and
+wish to downgrade to v25.01.0.
+
+```
+admin@example:/> show software
+BOOT ORDER
+primary secondary net
+
+NAME      STATE     VERSION                DATE
+primary   booted    v25.03.1               2025-04-25T11:36:26+00:00
+secondary inactive  v25.03.1               2025-04-25T10:24:31+00:00
+admin@example:/>
+```
+
+#### Downgrading when applying a backup startup configuration
+
+This is the recommended approach to downgrade, given that you have a
+backup configuration available.  The objective is to avoid ending up
+with the unit in *failure config*.
+
+1. Find the backup configuration file.
+2. Run `upgrade URL` to install Infix image to downgrade to.
+3. Copy backup startup configuration to current startup configuration
+   (from shell).
+4. Reboot.
+
+*Find the backup configuration file:*
+
+Assume you have a backup startup config for the Infix version to
+downgrade to (here Infix v25.01.0, config `version 1.4`).
+
+The preferred approach is to use a startup configuration backed up
+when running Infix v25.01.0 on the unit. See the section on [upgrading
+Infix](#upgrading-infix) above for more information. In the example
+below, there is a backup file available named
+*v25.01.0-startup-config.cfg* 
+
+```
+admin@example:/> dir /cfg
+/cfg directory
+backup/             ssl/                startup-config.cfg           v25.01.0-startup-config.cfg
+
+admin@example:/> 
+```
+
+The alternative is to use a startup config implicitly backed up by the
+system as part of [configuration migration](#configuration-migration).
+
+```
+admin@example:/> dir /cfg/backup/
+/cfg/backup/ directory
+startup-config-1.4.cfg
+
+admin@example:/>
+```
+
+> [!CAUTION] Using a backup configuration file stored when the unit
+> was running the old version (e.g., v25.01.0-startup-config.cfg) is
+> preferred. Although backup files stored due to configuration
+> migration (e.g., startup-config-1.4.cfg) usually works too if the
+> configuration file version (`1.4`) matches, there are
+> situations when the system may fail to apply it as described below.
+
+The *configuration file version* (`1.4`) is only incremented when
+changes in YANG configuration syntax mandates it to handle
+*upgrading*.  Say the next Infix version includes a new feature
+setting, it can still have version `1.4`, as upgrading to it would not
+need migration. If a user then enables the new feature setting, the
+new configuration will no longer be compatible with the previous *Infix
+version*. A downgrade after enabling new features risks ending up with
+the unit in *failure config*. 
+
+
+*Use `upgrade` command to downgrade:*
+
+```
+admin@example:/> upgrade tftp://198.18.117.1/infix-aarch64-25.01.0.pkg
+installing
+  0% Installing
+  0% Determining slot states
+ 10% Determining slot states done.
+ ...
+ 99% Copying image to rootfs.1 done.
+ 99% Updating slots done.
+100% Installing done.
+Installing `tftp://198.18.117.1/infix-aarch64-25.01.0.pkg` succeeded
+admin@example:/>
+```
+
+*Apply the backup configuration file:*
+
+It is recommended to use a backup configuration file for the Infix version to
+downgrade to, if there is one available.
+
+```
+admin@example:/> copy /cfg/v25.01.0-startup-config.cfg /cfg/startup-config.cfg
+Overwrite existing file /cfg/startup-config.cfg (y/N)? y
+admin@example:/>
+```
+
+An alternative is to use a backup file stored when the system
+conducted a [configuration migration](#configuration-migration). See
+the *caution* note above.
+
+```
+admin@example:/> copy /cfg/backup/startup-config-1.4.cfg /cfg/startup-config.cfg
+Overwrite existing file /cfg/startup-config.cfg (y/N)? y
+admin@example:/>
+```
+
+*Reboot:*
+
+The unit will come up with the applied backup configuration. 
+
+```
+admin@example:/> reboot
+[ OK ] Saving system clock to file
+[ OK ] Stopping Software update service
+[ OK ] Stopping Status daemon
+...
+[ OK ] Bootstrapping YANG datastore
+[ OK ] Starting Configuration daemon
+[ OK ] Loading startup-config
+[ OK ] Update DNS configuration
+[ OK ] Verifying self-signed https certificate
+[ OK ] Starting Status daemon
+
+Infix OS — Immutable.Friendly.Secure v25.01.0 (ttyS0)
+example login:
+```
+> [!NOTE]
+> If the unit despite these measures ends up in *failure config*, see
+> the next section for more information on how to recover.
+
+#### Downgrading without applying a backup startup configuration
+
+This procedure assumes you have access to the unit's console port and
+its default login credentials[^9].
+
+1. Downgrade
+2. Reboot
+3. Login with unit's default credentials
+4. Conduct factory reset
+5. (Then go on configure the unit as you wish)
+
+*Use `upgrade` command to downgrade:*
+
+```
+admin@example:/> upgrade tftp://198.18.117.1/infix-aarch64-25.01.0.pkg
+installing
+  0% Installing
+  0% Determining slot states
+ 10% Determining slot states done.
+ ...
+ 99% Copying image to rootfs.1 done.
+ 99% Updating slots done.
+100% Installing done.
+Installing `tftp://198.18.117.1/infix-aarch64-25.01.0.pkg` succeeded
+admin@example:/>
+```
+
+*Reboot:*
+
+Conduct a reboot. During boot, the unit fails to apply the existing
+startup configuration (config version `1.5` while software expects
+version `1.4` or earlier), and instead applies its [failure
+config][7]. This is what is seen on the console when this situation
+occurs. Note that the login prompt displays `failed` as part of the
+*hostname*.
+
+```
+admin@example:/> reboot
+[ OK ] Saving system clock to file
+[ OK ] Stopping Software update service
+[ OK ] Stopping Status daemon
+...
+[ OK ] Verifying SSH host keys
+[ OK ] Bootstrapping YANG datastore
+[ OK ] Starting Configuration daemon
+[FAIL] Loading startup-config
+[ OK ] Loading failure-config
+[ OK ] Verifying self-signed https certificate
+[ OK ] Starting Status daemon
+
+Infix OS — Immutable.Friendly.Secure v25.01.0 (ttyS0)
+
+ERROR: Corrupt startup-config, system has reverted to default login credentials
+failed-00-00-00 login:
+```
+
+To remedy a situation like this, you can login with the unit's *default
+login credentials*, preferrably via a [console port][8].
+The unit's default credentials are typically printed on a sticker on
+the unit.
+
+```
+failed-00-00-00 login: admin
+Password:
+
+Run the command 'cli' for interactive OAM
+
+admin@failed-00-00-00:~$
+```
+
+When it is *safe* from a network operations perspective, you can
+conduct a factory reset and reboot. It is recommended to remove the
+unit from any production network before doing this, as a factory reset
+may enable undesired connectivity between the unit's ports.
+
+```
+admin@failed-00-00-00:~$ factory
+Factory reset device (y/N)? y
+factory: scheduled factory reset on next boot.
+Reboot now to perform reset, (y/N)? y
+[ OK ] Saving system time (UTC) to RTC
+[ OK ] Stopping mDNS alias advertiser
+...
+[ OK ] Starting Configuration daemon
+[ OK ] Loading startup-config
+[ OK ] Update DNS configuration
+[ OK ] Verifying self-signed https certificate
+[ OK ] Starting Status daemon
+[ OK ] Starting Status daemon
+
+
+Please press Enter to activate this console.
+
+Infix OS — Immutable.Friendly.Secure v25.01.0 (ttyS0)
+example login:
+```
+
+Continued configuration is done as with any unit after factory reset.

 [1]: https://www.rfc-editor.org/rfc/rfc7317
 [2]: https://github.com/kernelkit/infix/blob/main/src/confd/yang/infix-system%402024-02-29.yang
 [3]: https://www.rfc-editor.org/rfc/rfc8341
+[4]: https://chrony-project.org/doc/4.6.1/chronyc.html
+[5]: https://github.com/kernelkit/infix/blob/main/src/confd/yang/confd/infix-system-software.yang
+[6]: netboot.md
+[7]: introduction.md#system-boot
+[8]: management.md#console-port
+[^9]: In failure config, Infix puts all Ethernet ports as individual
+    interfaces. With direct access, one can connect with e.g., SSH,
+    using link local IPv6 addresses. This as an alternative to
+    connecting via a console port.
+[^10]: Set up an FTP/TFTP/SFTP or HTTP/HTTPS server on the same LAN. 
+
+[11]: scripting.md#-backup-configuration-using-sysrepocfg-and-scp
@@ -243,23 +243,15 @@ spanning tree matches the expected one.

 Integration to Infix
 --------------------
-To successfully run all Infix tests, the image must be built in 
-'test-mode'. This can be achieved by setting the DISK_IMAGE_TEST_MODE
-parameter to true. Although this is the default setting, it’s advisable
-to verify it by running:
+When the test environment is started with Qeneth, it doesn't use the 
+base image directly. Instead, it creates a copy and inserts a `test-mode`
+flag into it. During the bootstrap phase, the system checks for the 
+presence of the test-mode flag (file).

-    $ make menuconfig
-    (External Options --> -*- Disk image --> [*] Enable Test Mode)
-
-Building an image in 'test-mode' results in the creation of a 'test-mode'
-file within the auxiliary (aux) partition of the Infix disk image 
-(/mnt/aux/test-mode).
-
-During the bootstrap phase, the system checks for the presence of this 
-test-mode flag (file). If the flag exists, a 'test-config.cfg' file is 
-generated. In the following step, the system loads the 'test-config' 
-instead of the standard startup-config (or factory-config). This 
-configuration is simple and safe, equivalent to the one used in 'Secure Mode'
+If the flag exists, a 'test-config.cfg' file is generated. In the 
+following step, the system loads the 'test-config' instead of the
+standard `startup-config` (or `factory-config`). This configuration
+is simple and safe, equivalent to the one used in 'Secure Mode' 
 (also known as 'failure-config').

 Additionally, the configuration enables extra RPCs related to system 
@@ -25,17 +25,6 @@ for `x86_64`:
    $ make
    $ make test

-It is important to mention that Infix build system by default creates
-an image in 'test-mode'. The mode is set by DISK_IMAGE_TEST_MODE
-parameter (default=true). To generate a standard image set the
-DISK_IMAGE_TEST_MODE to 'false'. However, only the test mode ensures
-that all Infix tests are executed properly. Prior to the set of commands
-above, it is always good to check that DISK_IMAGE_TEST_MODE is properly
-set by running:
-
-    $ make menuconfig
-    (External Options --> -*- Disk image --> [*] Enable Test Mode)
-
 ### Physical Devices

 To run the tests on a preexisting topology from the host's network
@@ -99,8 +88,11 @@ arguments:
 To run a suite of tests, e.g., only the DHCP client tests, pass the
 suite as an argument to [9PM][]:

-    11:42:53 infamy0:test # ./9pm/9pm.py case/infix_dhcp/all.yaml
+    11:42:53 infamy0:test # ./9pm/9pm.py case/infix_dhcp/infix_dhcp.yaml

+To run the suite of all tests:
+
+    11:42:53 infamy0:test # ./9pm/9pm.py case/all.yaml

 ### Connecting to Infamy

@@ -131,11 +123,11 @@ there is another helper script in Infamy for this:
    Trying 127.0.0.1...
    Connected to 127.0.0.1.

-    Infix -- a Network Operating System v23.11.0-226-g0c144da (console)
+    Infix OS — Immutable.Friendly.Secure v23.11.0-226-g0c144da (console)
    infix-00-00-00 login: admin
    Password:
    .-------.
-    |  . .  | Infix -- a Network Operating System
+    |  . .  | Infix OS — Immutable.Friendly.Secure
    |-. v .-| https://kernelkit.org
    '-'---'-'

@@ -315,5 +307,52 @@ The test specifaction can be genererated with:

 	$ make test-spec

+### Test Development
+
+For adding a new test to the automated regression test suite, it's best
+to start by reviewing an existing test case.
+
+All tests are located in the `infix/test/case` repository and are 
+grouped by the features they verify. For example, 
+`infix/test/case/infix_services` contains tests for various Infix 
+services, such as LLDP and mDNS.
+
+While test grouping is flexible, each test should be placed in a 
+logically relevant category.
+
+When creating a new test group, add it to `infix/test/case/all.yaml`,
+to enable it to run as a 
+[subset of the test suite](#running-subsets-of-tests):
+
+```
+- name:  infix-services
+  suite: infix_services/infix_services.yaml
+```
+
+A new test (e.g., lldp_enable_disable) should be added to the 
+corresponding test group .yaml file, such as 
+`infix/test/cases/infix_services.yaml`:
+
+```
+- name: lldp_enable_disable
+  case: lldp_enable_disable/test.py
+```
+
+It is necessary to include the test in 
+`infix/test/case/infix_services/Readme.adoc` to ensure proper test 
+specification generation:
+
+```
+include::lldp_enable_disable/Readme.adoc[]
+```
+
+Each test case should have its own directory under, 
+`infix/test/case/infix_services`, containing: 
+  - `test.py` - the test script
+  - `topology.dot` - the logical topology definition.
+
+When the [test specification](#test-specification) is generated, 
+`topology.svg` and `Readme.adoc` should also be created. 
+
 [9PM]:    https://github.com/rical/9pm
 [Qeneth]: https://github.com/wkz/qeneth
@@ -0,0 +1,28 @@
+# Tunnel configuration
+
+Tunnel traffic from point A to point B
+
+
+## Generic Routing Encapsulation (GRE)
+
+The support for GRE tunnels includes IPv4 and IPv6 tunnels both in GRE
+(IP) and GRETAP (MAC) modes.
+```
+admin@example:/config/> edit interface gre1
+admin@example:/config/interface/gre1/> set type gretap
+admin@example:/config/interface/gre1/> set gre local 192.168.3.1 remote 192.168.3.2
+admin@example:/config/interface/gre1/> leave
+admin@example:/>
+```
+
+##  Virtual eXtensible Local Area Network (VXLAN)
+
+The support for VXLAN tunnels includes IPv4 and IPv6.
+
+```
+admin@example:/config/> edit interface vxlan100
+admin@example:/config/interface/vxlan100/> set vxlan local 192.168.3.1
+admin@example:/config/interface/vxlan100/> set vxlan remote 192.168.3.2
+admin@example:/config/interface/vxlan100/> set vxlan vni 100
+admin@example:/config/interface/vxlan100/> leave
+```
@@ -0,0 +1,152 @@
+# Wi-Fi (Wireless LAN)
+
+Infix includes built-in Wi-Fi client support for connecting to
+wireless networks. When a compatible Wi-Fi adapter is detected, the
+system automatically begins scanning for available networks.
+
+## Current Limitations
+
+- Only client mode is supported (no access point functionality)
+- USB hotplug is not supported - adapters must be present at boot
+- Interface naming may be inconsistent with multiple USB Wi-Fi adapters
+
+## Supported Wi-Fi Adapters
+
+Wi-Fi support is primarily tested with Realtek chipset-based adapters.
+
+### Known Working Chipsets
+
+- RTL8821CU
+- Other Realtek chipsets may work but are not guaranteed
+
+
+> [!NOTE]  Some Realtek chipsets require proprietary drivers not included in the standard kernel
+>          Firmware requirements vary by chipset
+>          Check kernel logs if your adapter is not detected
+
+## Configuration
+
+Add a supported Wi-Fi network device. To verify that it has been
+detected, look for `wifi0` in `show interfaces`
+
+```
+admin@example:/>  show interfaces
+INTERFACE       PROTOCOL   STATE       DATA
+lo              loopback   UP
+                ipv4                   127.0.0.1/8 (static)
+                ipv6                   ::1/128 (static)
+e1              ethernet   UP          02:00:00:00:00:01
+                ipv6                   fe80::ff:fe00:1/64 (link-layer)
+                ipv6                   fec0::ff:fe00:1/64 (link-layer)
+wifi0           ethernet   DOWN        f0:09:0d:36:5f:86
+                wifi                   ssid: ------, signal: ------
+
+```
+Add the new Wi-Fi interface to the configuration to start scanning.
+```
+admin@example:/config/> set interface wifi0
+admin@example:/config/> leave
+```
+Now the system will now start scanning in the background. To
+see the result read the operational datastore for interface `wifi0` or
+use the CLI
+
+```
+admin@infix-00-00-00:/> show interfaces name wifi0
+name                : wifi0
+type                : wifi
+index               : 3
+mtu                 : 1500
+operational status  : down
+physical address    : f0:09:0d:36:5f:86
+ipv4 addresses      :
+ipv6 addresses      :
+SSID                : ----
+Signal              : ----
+
+SSID                                    ENCRYPTION                    SIGNAL
+ssid1                                   WPA2-Personal                 excellent
+ssid2                                   WPA2-Personal                 excellent
+ssid3                                   WPA2-Personal                 excellent
+ssid4                                   WPA2-Personal                 good
+ssid5                                   WPA2-Personal                 good
+ssid6                                   WPA2-Personal                 good
+```
+
+In the CLI, signal strength is reported as: excellent, good, poor or
+bad. For precise values, use NETCONF or RESTCONF, where the RSSI (in
+dBm) is available in the operational datastore.
+
+Configure your Wi-Fi secret in the keystore, it should be between 8
+and 63 characters
+
+```
+admin@example:/> configure
+admin@example:/config/> edit keystore symmetric-key example
+admin@example:/config/keystore/symmetric-key/example/> set key-format wifi-preshared-key-format
+admin@example:/config/keystore/symmetric-key/example/> set cleartext-key mysecret
+admin@example:/config/keystore/symmetric-key/example/> leave
+admin@example:/>
+```
+
+Configure the Wi-Fi settings, set secret to the name selected above
+for the symmetric key, in this case `example`.
+
+WPA2 or WPA3 encryption will be automatically selected based on what
+the access point supports. No manual selection is required unless
+connecting to an open network. No support for certificate based
+authentication yet.
+
+Unencrypted network is also supported, to connect to an unencrypted
+network (generally not recommended):
+```
+admin@example:/config/interface/wifi0/> set wifi encryption disabled
+```
+
+A valid `country-code` is also required for regulatory compliance, the
+valid codes are documented in the YANG model `infix-wifi-country-codes`
+
+
+```
+admin@example:/> configure
+admin@example:/config/> edit interface wifi0
+admin@example:/config/interface/wifi0/>
+admin@example:/config/interface/wifi0/> set wifi ssid ssid1
+admin@example:/config/interface/wifi0/> set wifi secret example
+admin@example:/config/interface/wifi0/> set wifi country-code SE
+admin@example:/config/interface/wifi0/> leave
+```
+
+The Wi-Fi negotiation should now start immediately, provided that the
+SSID and pre-shared key are correct. You can verify the connection by
+running `show interfaces` again.
+
+
+```
+admin@example:/> show interfaces
+INTERFACE       PROTOCOL   STATE       DATA
+lo              loopback   UP
+                ipv4                   127.0.0.1/8 (static)
+                ipv6                   ::1/128 (static)
+e1              ethernet   UP          02:00:00:00:00:01
+                ipv6                   fe80::ff:fe00:1/64 (link-layer)
+                ipv6                   fec0::ff:fe00:1/64 (link-layer)
+wifi0           ethernet   UP          f0:09:0d:36:5f:86
+                wifi                   ssid: ssid1, signal: excellent
+
+admin@example:/>
+```
+
+## Troubleshooting Connection Issues
+
+Use `show wifi scan wifi0` and `show interfaces` to verify signal strength
+and connection status. If issues arise, try the following
+troubleshooting steps:
+
+1. **Verify signal strength**: Check that the target network shows "good" or "excellent" signal
+2. **Check credentials**: Verify the preshared key in `ietf-keystore`
+3. **Review logs**: Check system logs with `show log` for Wi-Fi related errors
+4. **Regulatory compliance**: Ensure the country-code matches your location
+5. **Hardware detection**: Confirm the adapter appears in `show interfaces`
+
+If issues persist, check the system log for specific error messages that can help identify the root cause.
@@ -1,9 +1,7 @@
-IXMSG = printf "\e[37;44m>>>   $(call qstrip,$(1))\e[0m\n"
-
+include $(BR2_EXTERNAL_INFIX_PATH)/infix.mk
 include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/package/*/*.mk))
 include $(BR2_EXTERNAL_INFIX_PATH)/board/common/common.mk
 -include $(BR2_EXTERNAL_INFIX_PATH)/board/$(patsubst "%",%,$(BR2_ARCH))/board.mk
-include $(BR2_EXTERNAL_INFIX_PATH)/infix.mk
 include $(BR2_EXTERNAL_INFIX_PATH)/test/test.mk

 .PHONY: local.mk
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`SUBSYSTEM=="net", ACTION=="add", TEST=="/sys/class/net/$name/wireless", NAME="wifi%n"`