test/infamy: Support calling arbitrary functions from within a netns

Add a helper that lets you call a Python function (or lambda) in the context of a network samespace. Example: with infamy.IsolatedMacVlan("eth0") as ns: res = ns.call(lambda: subprocess.run(["ip", "link"], capture_output=True)) print(res.stdout, f"\n[exitcode:{res.returncode}]") The call to subprocess.run will be executed in the context of the network namespace, and thus only list "lo" and the "iface" macvlan. The return value of the function passed to ns.call() is passed back over a multiprocessing.Pipe, which requires that the object be "picklable". This is true for most objects (even more complex ones like the CompletedProcess object seen in the example above). Some notable exceptions are things like file objects, sockets, etc. The setns(2) syscall is unfortunately not available in current versions of Python shipped with neither Ubuntu nor Alpine at the time of this writing. Therefore, shoot from the hip, assume that we're running on an x86_64 CPU, and just hotwire the syscall directly with some constants we found in a dumpster.
.github: add missing $ in variables
2026-07-29 20:23:01 +02:00 · 2024-02-09 21:16:15 +01:00 · 2024-02-02 10:15:13 +01:00 · 2024-02-02 09:08:44 +01:00 · 2024-02-02 08:53:02 +01:00 · 2024-02-01 14:18:14 +01:00
219 changed files with 17095 additions and 1365 deletions
@@ -16,7 +16,7 @@ jobs:
        variant: [netconf, classic]
      fail-fast: false
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set Build Variables
        id: vars
        run: |
@@ -28,7 +28,7 @@ jobs:
          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
      - name: Restore Cache of dl/
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: dl/
          key: dl-${{ matrix.platform }}-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
@@ -37,7 +37,7 @@ jobs:
            dl-${{ matrix.platform }}-
            dl-
      - name: Restore Cache of .ccache/
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: .ccache/
          key: ccache-${{ matrix.platform }}-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
@@ -65,9 +65,10 @@ jobs:
        if: matrix.platform == 'x86_64' && matrix.variant == 'netconf'
        run: |
          make test-qeneth
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          path: output/${{ steps.vars.outputs.tgz }}
+          name: artifact-${{ matrix.variant }}-${{ matrix.platform }}
  release:
    if: ${{github.repository_owner == 'kernelkit' && github.ref_name == 'main'}}
    name: Upload Latest Build
@@ -76,7 +77,10 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: "artifact-*"
+          merge-multiple: true
      - uses: ncipollo/release-action@v1
        with:
          allowUpdates: true
@@ -1,6 +1,8 @@
 name: Coverity Scan

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

 env:
@@ -9,6 +11,7 @@ env:

 jobs:
  coverity:
+    if: ${{github.repository_owner == 'kernelkit'}}
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -21,7 +24,7 @@ jobs:
               --post-data "token=$TOKEN&project=${PROJECT_NAME}&md5=1" \
               -O coverity-latest.tar.gz.md5
          echo "md5=$(cat coverity-latest.tar.gz.md5)" | tee -a $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
        id: cache
        with:
          path: coverity-latest.tar.gz
@@ -75,7 +78,7 @@ jobs:
            --form description="${PROJECT_NAME} $(git rev-parse HEAD)" \
            https://scan.coverity.com/builds?project=${PROJECT_NAME}
      - name: Upload build.log
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: coverity-build.log
          path: cov-int/build-log.txt
@@ -18,7 +18,7 @@ jobs:
    name: Regression Testing
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: 'true'
      - name: Set Build Variables
@@ -28,7 +28,7 @@ jobs:
          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
      - name: Restore Cache of dl/
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: dl/
          key: dl-x86_64-netconf-${{ hashFiles('.git/modules/buildroot/refs/heads/master', 'package/*/*.hash') }}
@@ -37,7 +37,7 @@ jobs:
            dl-x86_64-
            dl-
      - name: Restore Cache of .ccache/
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: .ccache/
          key: ccache-x86_64-netconf-${{ hashFiles('.git/modules/buildroot/refs/head/master', 'package/*/*.hash') }}
@@ -48,6 +48,10 @@ jobs:
      - name: Configure NETCONF
        run: |
          make x86_64_defconfig
+
+      - name: Unit Test
+        run: make test-unit
+
      - name: Build
        run: |
          make
@@ -58,7 +62,7 @@ jobs:
          ln -s ${{ steps.vars.outputs.dir }} images
          tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          path: output/${{ steps.vars.outputs.tgz }}

@@ -28,7 +28,7 @@ jobs:
        variant: [netconf, classic]
      fail-fast: false
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set Release Variables
        id: build
        run: |
@@ -52,7 +52,7 @@ jobs:
          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
      - name: Restore Cache of dl/
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: dl/
          key: dl-${{ matrix.platform }}-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
@@ -61,7 +61,7 @@ jobs:
            dl-${{ matrix.platform }}-
            dl-
      - name: Restore Cache of .ccache/
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: .ccache/
          key: ccache-${{ matrix.platform }}-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
@@ -87,16 +87,20 @@ jobs:
          mv images ${{ steps.build.outputs.dir }}
          ln -s ${{ steps.build.outputs.dir }} images
          tar chfz ${{ steps.build.outputs.tgz }} ${{ steps.build.outputs.dir }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          path: output/${{ steps.build.outputs.tgz }}
+          name: artifact-${{ matrix.variant }}-${{ matrix.platform }}
  release:
    name: Release Infix ${{ github.ref_name }}
    needs: build
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: "artifact-*"
+          merge-multiple: true
      - name: Extract ChangeLog entry ...
        run: |
          awk '/^-----*$/{if (x == 1) exit; x=1;next}x' doc/ChangeLog.md \
@@ -2,8 +2,8 @@
 	path = buildroot
 	url = ../buildroot.git
 [submodule "9pm"]
-	path = 9pm
+	path = test/9pm
 	url = ../9pm
 [submodule "qeneth"]
-	path = qeneth
+	path = test/qeneth
 	url = ../qeneth.git
@@ -1,4 +1,5 @@
-[![License Badge][]][License] [![Coverity Status][]][Coverity Scan]
+[![License Badge][]][License] [![Coverity Status][]][Coverity Scan] [![Discord][discord-badge]][discord-url]
+
 <img align="right" src="doc/logo.png" alt="Infix - Linux <3 NETCONF" width=480 border=10>
 <details><summary><b>Documentation</b></summary>

@@ -98,3 +99,5 @@ more information, see: [Infix in Virtual Environments](doc/virtual.md).
 [License Badge]:   https://img.shields.io/badge/License-GPL%20v2-blue.svg
 [Coverity Scan]:   https://scan.coverity.com/projects/29393
 [Coverity Status]: https://scan.coverity.com/projects/29393/badge.svg
+[discord-badge]:   https://img.shields.io/discord/1182652155618918411.svg?logo=discord
+[discord-url]:     https://discord.gg/6bHJWQNVxN
@@ -6,6 +6,7 @@
 * Device tree for Alder board
 */

+#include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>

@@ -195,53 +196,6 @@
 };


-/* CP SDHCI (Micro-SD) */
-
-/ {
-	cp0_reg_sd_vccq: cp0_sd_vccq@0 {
-		compatible = "regulator-gpio";
-		regulator-name = "cp0_sd_vccq";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <3300000>;
-		/* gpios = <&CP_SD_HST_18_EN>; */
-		states = <1800000 0x1
-			  3300000 0x0>;
-	};
-
-	cp0_reg_sd_vcc: cp0_sd_vcc@0 {
-		compatible = "regulator-fixed";
-		regulator-name = "cp0_sd_vcc";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		/* gpio = <&CP_SD_CRD_PWR_OFF>; */
-		enable-active-high;
-		regulator-always-on;
-	};
-};
-
-&cp0_pinctrl {
-	cp0_sdhci_pins: cp0-sdhi-pins-0 {
-		marvell,pins = \
-			CP_SD_CRD_PWR_OFF(MPP_ID), CP_SD_HST_18_EN(MPP_ID),	\
-			CP_SD_CRD_DT(MPP_ID), CP_SD_LED(MPP_ID),		\
-			CP_SD_CLK(MPP_ID), CP_SD_CMD(MPP_ID),			\
-			CP_SD_D0(MPP_ID), CP_SD_D1(MPP_ID), 			\
-			CP_SD_D2(MPP_ID), CP_SD_D3(MPP_ID);
-		marvell,function = "sdio";
-	};
-};
-
-&cp0_sdhci0 {
-	status = "disabled";
-	pinctrl-names = "default";
-	pinctrl-0 = <&cp0_sdhci_pins>;
-	bus-width = <4>;
-	/* cd-gpios = <&CP_SD_CRD_DT>; */
-	vqmmc-supply = <&cp0_reg_sd_vccq>;
-	vmmc-supply = <&cp0_reg_sd_vcc>;
-};
-
-
 /* SPI1 (Boot FLASH) */

 &cp0_pinctrl {
@@ -647,9 +601,19 @@
 	};
 };

+/* Reset button */
+/ {
+	gpio-keys {
+		compatible = "gpio-keys";
+		up {
+			label = "factory-reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&GPIO_RESET_BUTTON>;
+		};
+	};
+};

 /* System LEDs */
-
 / {
 	power-a {
 		compatible = "gpio-charger";
@@ -0,0 +1,4 @@
+label Infix on NanoPi R2S
+  kernel /boot/Image
+  devicetree /boot/rk3328-nanopi-r2s.dtb
+  append root=/dev/mmcblk0p1 rw rootwait bonding.max_bonds=0 dummy.numdummies=0 fb_tunnels=none quiet
@@ -0,0 +1,38 @@
+image cfg.ext4 {
+	ext4 {
+		label = "cfg"
+	}
+	empty = true
+	size = 16M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot-tpl-spl-dtb {
+		in-partition-table = "no"
+		image = "idbloader.img"
+		offset = 32K
+	}
+
+	partition u-boot-dtb {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 8M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		offset = 16M
+		image = "rootfs.ext4"
+	}
+
+	partition cfg {
+		partition-type = 0x83
+		image = "cfg.ext4"
+	}
+}
+
+# Silence genimage warnings
+config {}
@@ -0,0 +1,654 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_JIT=y
+CONFIG_PREEMPT=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PROFILING=y
+CONFIG_KEXEC_FILE=y
+CONFIG_CRASH_DUMP=y
+CONFIG_ARCH_ACTIONS=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_NUMA=y
+CONFIG_COMPAT=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_HIBERNATION=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPUFREQ_DT=y
+CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=y
+CONFIG_ACPI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_GCC_PLUGINS is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_IPV6=m
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_TABLES=y
+CONFIG_NF_TABLES_INET=y
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_GATE=m
+CONFIG_BT=m
+CONFIG_BT_HIDP=m
+# CONFIG_BT_LE is not set
+CONFIG_BT_LEDS=y
+# CONFIG_BT_DEBUGFS is not set
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_RFKILL=y
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PASID=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCIE_ROCKCHIP_DW_HOST=y
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+CONFIG_PCI_EPF_TEST=m
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCPI_PROTOCOL=y
+CONFIG_EFI_CAPSULE_LOADER=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_MTD_NAND_DENALI_DT=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_OF_OVERLAY=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_NBD=m
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_NVME=m
+CONFIG_SRAM=y
+CONFIG_PCI_ENDPOINT_TEST=m
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_UACCE=m
+# CONFIG_SCSI_PROC_FS is not set
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_HISI_SAS=y
+CONFIG_SCSI_HISI_SAS_PCI=y
+CONFIG_MEGARAID_SAS=y
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_CEVA=y
+CONFIG_SATA_SIL24=y
+CONFIG_PATA_OF_PLATFORM=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=y
+CONFIG_WIREGUARD=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_VXLAN=y
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_TUN=y
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ACTIONS is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ASIX is not set
+CONFIG_ATL2=m
+CONFIG_ALX=m
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_GOOGLE is not set
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_LITEX is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_PENSANDO is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_R8169=m
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_STMMAC_ETH=y
+# CONFIG_DWMAC_GENERIC is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_AX88796B_PHY=y
+CONFIG_MICREL_PHY=y
+CONFIG_MICROSEMI_PHY=y
+CONFIG_AT803X_PHY=m
+CONFIG_REALTEK_PHY=y
+CONFIG_ROCKCHIP_PHY=y
+CONFIG_MDIO_BITBANG=y
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_THUNDER=y
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
+CONFIG_MDIO_BUS_MUX_MMIOREG=y
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+CONFIG_WCN36XX=m
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+# CONFIG_WLAN_VENDOR_BROADCOM is not set
+# CONFIG_WLAN_VENDOR_CISCO is not set
+# CONFIG_WLAN_VENDOR_INTEL is not set
+# CONFIG_WLAN_VENDOR_INTERSIL is not set
+# CONFIG_WLAN_VENDOR_MARVELL is not set
+# CONFIG_WLAN_VENDOR_MEDIATEK is not set
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTW88=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BS=m
+CONFIG_RTW88_8822BU=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CS=m
+CONFIG_RTW88_8822CU=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8723DS=m
+CONFIG_RTW88_8723DU=m
+CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CS=m
+CONFIG_RTW88_8821CU=m
+CONFIG_RTW88_DEBUG=y
+CONFIG_RTW89=m
+CONFIG_RTW89_8851BE=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852CE=m
+CONFIG_RTW89_DEBUGMSG=y
+# CONFIG_WLAN_VENDOR_RSI is not set
+# CONFIG_WLAN_VENDOR_TI is not set
+# CONFIG_WLAN_VENDOR_ZYDAS is not set
+# CONFIG_WLAN_VENDOR_QUANTENNA is not set
+CONFIG_NET_FAILOVER=y
+CONFIG_INPUT_FF_MEMLESS=y
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_RK805_PWRKEY=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_AMBAKMI=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_TCG_TPM=y
+CONFIG_TCG_TIS_I2C_INFINEON=y
+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
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_CADENCE_QUADSPI=y
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_DMA=y
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_PL022=y
+CONFIG_SPI_ROCKCHIP=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPMI=y
+CONFIG_PPS=y
+# CONFIG_PTP_1588_CLOCK is not set
+CONFIG_DEBUG_PINCTRL=y
+CONFIG_PINCTRL_RK805=y
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_GPIO_ALTERA=m
+CONFIG_GPIO_DWAPB=y
+CONFIG_GPIO_MB86S7X=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_MAX732X=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_BATTERY_SBS=m
+CONFIG_BATTERY_BQ27XXX=y
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_SENSORS_ARM_SCMI=y
+CONFIG_SENSORS_ARM_SCPI=y
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_CPU_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_ARM_SP805_WATCHDOG=y
+CONFIG_ARM_SBSA_WATCHDOG=y
+CONFIG_DW_WATCHDOG=y
+CONFIG_ARM_SMC_WATCHDOG=y
+CONFIG_MFD_RK8XX_I2C=y
+CONFIG_MFD_RK8XX_SPI=y
+CONFIG_MFD_STMFX=y
+CONFIG_REGULATOR_DEBUG=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_VCTRL=y
+CONFIG_REGULATOR_VEXPRESS=m
+# CONFIG_HID_GENERIC is not set
+# CONFIG_USB_HID is not set
+CONFIG_USB_CONN_GPIO=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_DYNAMIC_MINORS=y
+CONFIG_USB_OTG=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_ACM=m
+CONFIG_USB_STORAGE=y
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=y
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_HSIC_USB3503=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_SNP_UDC_PLAT=y
+CONFIG_USB_BDC_UDC=y
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_MMC_ARMMMCI=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ACPI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_ARASAN=y
+CONFIG_MMC_SDHCI_CADENCE=y
+CONFIG_MMC_SDHCI_F_SDH30=y
+CONFIG_MMC_SPI=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_EXYNOS=y
+CONFIG_MMC_DW_HI3798CV200=y
+CONFIG_MMC_DW_K3=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_MTK=y
+CONFIG_MMC_SDHCI_XENON=y
+CONFIG_MMC_SDHCI_AM654=y
+CONFIG_SCSI_UFSHCD=y
+CONFIG_SCSI_UFSHCD_PLATFORM=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=y
+CONFIG_LEDS_CLASS_MULTICOLOR=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_RK808=y
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_PL030=y
+CONFIG_RTC_DRV_PL031=y
+CONFIG_DMADEVICES=y
+CONFIG_PL330_DMA=y
+CONFIG_SYNC_FILE=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+# CONFIG_VHOST_MENU is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTLLIB=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_RTS5208=m
+# CONFIG_SURFACE_PLATFORMS is not set
+CONFIG_COMMON_CLK_SCMI=y
+CONFIG_COMMON_CLK_SCPI=y
+CONFIG_COMMON_CLK_PWM=y
+CONFIG_HWSPINLOCK=y
+# CONFIG_FSL_ERRATUM_A008585 is not set
+# CONFIG_HISILICON_ERRATUM_161010101 is not set
+# CONFIG_ARM64_ERRATUM_858921 is not set
+CONFIG_ARM_MHU=y
+CONFIG_PLATFORM_MHU=y
+CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_V3=y
+CONFIG_ROCKCHIP_IODOMAIN=y
+CONFIG_ROCKCHIP_DTPM=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_USB_GPIO=y
+CONFIG_MEMORY=y
+CONFIG_IIO=y
+CONFIG_MAX9611=m
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_VCNL4000=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_MPL3115=m
+CONFIG_PWM=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
+CONFIG_PHY_ROCKCHIP_EMMC=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
+CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_TYPEC=y
+CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_POWERCAP=y
+CONFIG_ARM_SCMI_POWERCAP=y
+CONFIG_DTPM=y
+CONFIG_DTPM_CPU=y
+CONFIG_DTPM_DEVFREQ=y
+CONFIG_ARM_SMMU_V3_PMU=m
+CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+CONFIG_MUX_MMIO=y
+CONFIG_INTERCONNECT=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_OVERLAY_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_HUGETLBFS=y
+CONFIG_EFIVAR_FS=y
+CONFIG_SQUASHFS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_ROOT_NFS=y
+CONFIG_9P_FS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_SECURITY=y
+CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_BS=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
+CONFIG_CRYPTO_DEV_ROCKCHIP=y
+CONFIG_CRYPTO_DEV_CCREE=m
+CONFIG_INDIRECT_PIO=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC8=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=32
+CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_FTRACE is not set
+CONFIG_MEMTEST=y
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
@@ -0,0 +1,14 @@
+--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts	2023-11-08 14:09:07.000000000 +0100
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts	2024-01-22 07:31:14.949550828 +0100
+@@ -20,6 +20,11 @@
+ 
+ 	chosen {
+ 		stdout-path = "serial2:1500000n8";
+
+		infix {
+			/* Default admin user password: 'admin' */
+			factory-password-hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A";
+		};
+ 	};
+ 
+ 	gmac_clk: gmac-clock {
@@ -6,3 +6,8 @@ if [ -L "$TARGET_DIR/etc/dropbear" ]; then
 	rm    "$TARGET_DIR/etc/dropbear"
 	mkdir "$TARGET_DIR/etc/dropbear"
 fi
+
+# Classic builds don't have D-Bus
+if [ -f "$TARGET_DIR/etc/dnsmasq.conf" ]; then
+    sed -i '/enable-dbus/d' "$TARGET_DIR/etc/dnsmasq.conf"
+fi
@@ -1 +1 @@
-run [S] /lib/infix/swup --
+run [S] /libexec/infix/swup --
@@ -47,18 +47,18 @@ ram([0-9]*)        root:disk 660 >rd/%1
 loop([0-9]+)       root:disk 660 >loop/%1
 sr[0-9]*           root:cdrom 660 @ln -sf $MDEV cdrom
 fd[0-9]*           root:floppy 660
-#SUBSYSTEM=block;.* root:disk 660 */lib/infix/storage-device
+#SUBSYSTEM=block;.* root:disk 660 */libexec/infix/storage-device

 # Run settle-nics every time new NIC appear.
 # If you don't want to auto-populate /etc/mactab with NICs,
 # run 'settle-nis' without '--write-mactab' param.
-#-SUBSYSTEM=net;DEVPATH=.*/net/.*;.*     root:root 600 @/lib/infix/settle-nics --write-mactab
+#-SUBSYSTEM=net;DEVPATH=.*/net/.*;.*     root:root 600 @/libexec/infix/settle-nics --write-mactab

 net/tun[0-9]*   root:netdev 660
 net/tap[0-9]*   root:root 600

 # alsa sound devices and audio stuff
-#SUBSYSTEM=sound;.*  root:audio 660 @/lib/infix/sound-control
+#SUBSYSTEM=sound;.*  root:audio 660 @/libexec/infix/sound-control

 adsp        root:audio 660 >sound/
 audio       root:audio 660 >sound/
@@ -106,7 +106,7 @@ cpu([0-9]+)     root:root 600 =cpu/%1/cpuid
 msr([0-9]+)     root:root 600 =cpu/%1/msr

 # Populate /dev/bus/usb.
-#SUBSYSTEM=usb;DEVTYPE=usb_device;.* root:root 660 */lib/infix/dev-bus-usb
+#SUBSYSTEM=usb;DEVTYPE=usb_device;.* root:root 660 */libexec/infix/dev-bus-usb

 # Catch-all other devices, Right now useful only for debuging.
-#.* root:root 660 */lib/infix/catch-all
+#.* root:root 660 */libexec/infix/catch-all
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Probe for various types of harware features
+
+if dmesg |grep -q QEMU || test -d /sys/module/qemu_fw_cfg; then
+    initctl -nbq cond set qemu
+fi
@@ -1,3 +1,4 @@
+ifeq ($(SIGN_ENABLED),y)
 include $(BR2_EXTERNAL_INFIX_PATH)/board/common/uboot/uboot.mk

 define RAUC_POST_BUILD_INSTALL_CERT
@@ -7,3 +8,4 @@ define RAUC_POST_BUILD_INSTALL_CERT
 		cp $(crt) $(TARGET_DIR)/etc/rauc/keys/$(shell openssl x509 -hash -noout <$(crt)).0;)
 endef
 RAUC_POST_BUILD_HOOKS += RAUC_POST_BUILD_INSTALL_CERT
+endif
@@ -208,7 +208,7 @@ vpd_args()

 	cat <<EOF | "$onieprom" -e >"$vpd_file"
 {
-  "manufacture-date": "$(date +"%d/%m/%Y %H:%M:%S")",
+  "manufacture-date": "$(date +"%m/%d/%Y %H:%M:%S")",
  "vendor-extension": [
    [
      61046,
@@ -0,0 +1,27 @@
+# This file defines default behavior and a skeleton for including config
+# snippets from both confd, i.e., ietf-system.yang, and DHCP clients.
+# Default values taken from Debian /etc/chrony/chrony.conf
+
+# *.conf when acting as an NTP server
+confdir /etc/chrony/conf.d
+
+# *.sources from DHCP clients, e.g., /run/chrony-dhcp/$ifname.sources:
+#                                    server 192.0.2.1 iburst
+sourcedir /run/chrony/dhcp-sources.d
+
+# *.sources for NTP servers generated by confd:ietf-system.c
+sourcedir /etc/chrony/sources.d
+
+# Where to store the system clock rate information across reboots.
+driftfile /var/lib/chrony/chrony.drift
+
+# Stop bad estimates upsetting machine clock.
+maxupdateskew 100.0
+
+# Enables kernel synchronisation (every 11 minutes) of the real-time
+# clock. Note that it can’t be used along with the 'rtcfile' directive.
+rtcsync
+
+# Step the system clock instead of slewing it if the adjustment is
+# larger than one second, but only in the first three clock updates.
+makestep 1 3
@@ -0,0 +1 @@
+CHRONY_ARGS="-f /etc/chrony/chrony.conf"
@@ -1,3 +1,3 @@
-run [S] log:console   /lib/infix/probe -- Probing system information
-run [S] <pid/syslogd> /lib/infix/sysctl-sync-ip-conf --
-run [S] <pid/syslogd> /lib/infix/nameif -- Probing network interfaces
+run [S] log:console   /libexec/infix/probe -- Probing system information
+run [S] <pid/syslogd> /libexec/infix/sysctl-sync-ip-conf --
+run [S] <pid/syslogd> /libexec/infix/nameif -- Probing network interfaces
@@ -1,5 +1,5 @@
 set G_MESSAGES_DEBUG=nocolor
-service [2345789] <service/dbus/running> \
+service [2345] <service/dbus/running> \
 	env:-/etc/default/rauc log:prio:user.notice \
 	rauc service $RAUC_ARGS -- Software update service

@@ -12,11 +12,11 @@ debugfs	/sys/kernel/debug	debugfs		nofail			0	0
 cfgfs		/config		configfs	nofail,noauto		0	0

 # The chosen backing storage for the overlays placed on /cfg, /etc,
-# /home, /root, and /var, are determined dynamically by /lib/infix/mnt
+# /home, /root, and /var, are determined dynamically by /libexec/infix/mnt
 # depending on the available devices.
 mnttmp		/mnt/tmp	tmpfs		defaults			0	0
 LABEL=aux	/mnt/aux	auto		noatime,nodiratime,noauto	0	0
 LABEL=var	/mnt/var	auto		noatime,nodiratime,noauto	0	0
 LABEL=cfg	/mnt/cfg	auto		noatime,nodiratime,noauto	0	0
 hostfs		/mnt/host	9p		cache=none,msize=16384,noauto	0	0
-/lib/infix/mnt# /cfg		helper		none				0	0
+/libexec/infix/mnt# /cfg		helper		none				0	0
@@ -0,0 +1,4 @@
+.-------.
+|  . .  | Infix -- a Network Operating System
+|-. v .-| https://kernelkit.github.io
+'-'---'-'
@@ -0,0 +1 @@
+%wheel ALL=(ALL:ALL) NOPASSWD: ALL
@@ -1 +1,3 @@
-d  /var/lib/chrony	0755 chrony chrony
+d  /var/lib/chrony		0750 chrony chrony
+d  /run/chrony			0750 chrony chrony
+d  /run/chrony/dhcp-sources.d	0755 chrony chrony
@@ -33,11 +33,11 @@ check_factory()
    fi

    # Add to your br2-external to extend factory-reset check
-    if [ ! -x /lib/infix/check-factory ]; then
+    if [ ! -x /libexec/infix/check-factory ]; then
 	return 1;
    fi

-    /lib/infix/check-factory
+    /libexec/infix/check-factory
 }

 factory_reset()
@@ -7,7 +7,7 @@ inform()
    local level="$1"
    shift

-    logger -p "daemon.$level" -t dagger -c $LOGGER_STDOUT "$@"
+    logger -p "daemon.$level" -I $PPID -t dagger -c $LOGGER_STDOUT "$@"
 }

 abort()
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Helper script to chronyc, checks if daemon is running
+
+if ! chronyc serverstats >/dev/null; then
+   echo "NTP client not enabled."
+   exit 1
+fi
+
+case $1 in
+    tracking)
+	chronyc tracking
+	;;
+    sources)
+	chronyc sources -v
+	;;
+    *)
+	echo "Unknown NTP command."
+	;;
+esac
@@ -1,14 +1,16 @@
 #!/bin/sh
-
-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
+# This script expect a system with resolvconf (openresolv) and iproute2

 [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1

 ACTION="$1"
-RESOLV_CONF="/etc/resolv.conf"
-[ -e $RESOLV_CONF ] || touch $RESOLV_CONF
+IP_CACHE="/var/lib/misc/${interface}.cache"
+RESOLV_CONF="/run/resolvconf/interfaces/${interface}.conf"
+NTPFILE="/run/chrony/dhcp-sources.d/${interface}.sources"
 [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
-[ -n "$subnet" ] && NETMASK="$subnet"
+[ -n "$subnet" ] || subnet=32
+[ -n "$metric" ] || metric=100
+
 # Handle stateful DHCPv6 like DHCPv4
 [ -n "$ipv6" ] && ip="$ipv6/128"

@@ -16,113 +18,139 @@ if [ -z "${IF_WAIT_DELAY}" ]; then
 	IF_WAIT_DELAY=10
 fi

-wait_for_ipv6_default_route() {
-	printf "Waiting for IPv6 default route to appear"
-	while [ $IF_WAIT_DELAY -gt 0 ]; do
-		if ip -6 route list | grep -q default; then
-			printf "\n"
-			return
-		fi
-		sleep 1
-		printf "."
-		: $((IF_WAIT_DELAY -= 1))
-	done
-	printf " timeout!\n"
+log()
+{
+    logger -I $$ -t udhcpc -p user.notice "$*"
 }

-flush_dhcp_addresses() {
-	addrs=$(ip -j addr show dev $interface | jq -c \
-		'.[0].addr_info[] | select(.family == "inet") | select(.protocol == "dhcp")')
-
-	for addr in $addrs; do
-		ip="$(echo "$addr" | jq -r '."local"')"
-		prefix="$(echo "$addr" | jq -r '."prefixlen"')"
-		ip addr del "$ip/$prefix" dev "$interface"
-	done
+wwait_for_ipv6_default_route()
+{
+    log "waiting for IPv6 default route to be installed."
+    while [ $IF_WAIT_DELAY -gt 0 ]; do
+	if ip -6 route list proto dhcp dev $interface | grep -q default; then
+	    return
+	fi
+	sleep 1
+	printf "."
+	: $((IF_WAIT_DELAY -= 1))
+    done
+    log "Timed out witing for IPv6 default route!"
 }

+# RFC3442: If the DHCP server returns both a Classless
+# Static Routes option and a Router option, the DHCP
+# client MUST ignore the Router option.
+set_dhcp_routes()
+{
+    if [ -n "$staticroutes" ]; then
+	# 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"
+	    ip route add "$1" via "$2" dev $interface metric $metric proto dhcp
+	    shift 2
+	done
+    elif [ -n "$router" ] ; then
+	for i in $router ; do
+	    ip route add default via $i dev $interface metric $((metric++)) proto dhcp
+	done
+    fi
+}
+
+clr_dhcp_routes()
+{
+    log "deleting DHCP routes from $interface"
+    ip route show proto dhcp dev $interface | while read rt via nh dev dev; do
+	log "removing $rt nh $nh on $dev"
+	ip route del $rt via $nh dev $dev proto dhcp
+    done
+}
+
+clr_dhcp_addresses()
+{
+    addrs=$(ip -j addr show dev $interface \
+		| jq -c '.[0].addr_info[] | select(.family == "inet") | select(.protocol == "dhcp")')
+
+    for addr in $addrs; do
+	ip="$(echo "$addr" | jq -r '."local"')"
+	prefix="$(echo "$addr" | jq -r '."prefixlen"')"
+	log "removing $ip/$prefix from $interface"
+	ip addr del "$ip/$prefix" dev "$interface"
+    done
+}
+
+log "action $ACTION"
 case "$ACTION" in
-	deconfig)
-		flush_dhcp_addresses
+    deconfig)
+	clr_dhcp_addresses
+	clr_dhcp_routes
+	/bin/ip link set dev $interface up

-		/bin/ip link set dev $interface up
+	# drop info from this interface
+	rm -f "$RESOLV_CONF"
+	rm -f "$NTPFILE"
+	if [ -x /usr/sbin/avahi-autoipd ]; then
+	    /usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface
+	fi
+	;;

-		# drop info from this interface
-		# resolv.conf may be a symlink to /tmp/, so take care
-		TMPFILE=$(mktemp)
-		grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE
-		cat $TMPFILE > $RESOLV_CONF
-		rm -f $TMPFILE
+    leasefail|nak)
+	if [ -x /usr/sbin/avahi-autoipd ]; then
+	    /usr/sbin/avahi-autoipd -c $interface || /usr/sbin/avahi-autoipd -wD $interface --no-chroot
+	fi
+	;;

-		if [ -x /usr/sbin/avahi-autoipd ]; then
-			/usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface
-		fi
-		;;
+    renew|bound)
+	if [ -x /usr/sbin/avahi-autoipd ]; then
+	    /usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface
+	fi

-	leasefail|nak)
-		if [ -x /usr/sbin/avahi-autoipd ]; then
-			/usr/sbin/avahi-autoipd -c $interface || /usr/sbin/avahi-autoipd -wD $interface --no-chroot
-		fi
-		;;
+	if /bin/ip addr add dev $interface $ip/$subnet $BROADCAST proto 5; then
+	    echo "$ip" > "$IP_CACHE"
+	fi
+	if [ -n "$ipv6" ] ; then
+	    wait_for_ipv6_default_route
+	fi

-	renew|bound)
-		if [ -x /usr/sbin/avahi-autoipd ]; then
-			/usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface
-		fi
-		/bin/ip addr add dev $interface $ip/$NETMASK $BROADCAST proto 5
-		if [ -n "$ipv6" ] ; then
-			wait_for_ipv6_default_route
-		fi
+	clr_dhcp_routes
+	set_dhcp_routes

-		# RFC3442: If the DHCP server returns both a Classless
-		# Static Routes option and a Router option, the DHCP
-		# client MUST ignore the Router option.
-		if [ -n "$staticroutes" ]; then
-			echo "deleting routers"
-			route -n | while read dest gw mask flags metric ref use iface; do
-				[ "$iface" != "$interface" -o "$gw" = "0.0.0.0" ] || \
-					route del -net "$dest" netmask "$mask" gw "$gw" dev "$interface"
-			done
+	# set hostname if given
+	if [ -n "$hostname" ]; then
+	    log "setting new hostname: $hostname"
+	    hostname "$hostname"
+	    augtool -s "set /files/etc/hosts/*[ipaddr='127.0.1.1']/canonical $hostname"
+	fi

-			# format: dest1/mask gw1 ... destn/mask gwn
-			set -- $staticroutes
-			while [ -n "$1" -a -n "$2" ]; do
-				ip route add -net "$1" via "$2" dev "$interface" proto 16
-				shift 2
-			done
-		elif [ -n "$router" ] ; then
-			echo "deleting routers"
-			while route del default gw 0.0.0.0 dev $interface 2> /dev/null; do
-				:
-			done
+	# drop info from this interface
+	truncate -s 0 "$RESOLV_CONF"

-			for i in $router ; do
-				ip route add default via $i dev $interface proto 16
-			done
-		fi
+	# prefer rfc3397 domain search list (option 119) if available
+	if [ -n "$search" ]; then
+	    search_list=$search
+	elif [ -n "$domain" ]; then
+	    search_list=$domain
+	fi

-		# drop info from this interface
-		# resolv.conf may be a symlink to /tmp/, so take care
-		TMPFILE=$(mktemp)
-		grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE
-		cat $TMPFILE > $RESOLV_CONF
-		rm -f $TMPFILE
+	if [ -n "$search_list" ]; then
+	    log "adding search $search_list"
+	    echo "search $search_list # $interface" >> $RESOLV_CONF
+	fi

-		# prefer rfc3397 domain search list (option 119) if available
-		if [ -n "$search" ]; then
-			search_list=$search
-		elif [ -n "$domain" ]; then
-			search_list=$domain
-		fi
+	for i in $dns ; do
+	    log "adding dns $i"
+	    echo "nameserver $i # $interface" >> $RESOLV_CONF
+	    resolvconf -u
+	done

-		[ -n "$search_list" ] &&
-			echo "search $search_list # $interface" >> $RESOLV_CONF
-
-		for i in $dns ; do
-			echo adding dns $i
-			echo "nameserver $i # $interface" >> $RESOLV_CONF
-		done
-		;;
+	if [ -n "$ntpsrv" ]; then
+	    truncate -s 0 "$NTPFILE"
+	    for srv in $ntpsrv; do
+		log "got NTP server $srv"
+		echo "server $srv iburst" >> "$NTPFILE"
+	    done
+	    chronyc reload sources >/dev/null
+	fi
 esac

 HOOK_DIR="$0.d"
@@ -1,3 +1,3 @@
-#!/bin/bash -li
+#!/bin/sh
 # Source settings, aliases, and probe terminal size, then hand over to klish
-exec /usr/bin/klish
+exec env CLISH=yes bash -ilc /usr/bin/klish
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+set -e
+
+# Command line arguments:
+#   $1 event that happened:
+#          BIND:     Successfully claimed address
+#          CONFLICT: An IP address conflict happened
+#          UNBIND:   The IP address is no longer needed
+#          STOP:     The daemon is terminating
+#   $2 interface name
+#   $3 IP adddress
+
+PATH="$PATH:/usr/bin:/usr/sbin:/bin:/sbin"
+
+# Use a different metric for each interface, so that we can set
+# identical routes to multiple interfaces.
+
+METRIC=$((1000 + `cat "/sys/class/net/$2/ifindex" 2>/dev/null || echo 0`))
+
+if [ -x /bin/ip -o -x /sbin/ip ] ; then
+
+    # We have the Linux ip tool from the iproute package
+
+    case "$1" in
+        BIND)
+            ip addr flush dev "$2" label "$2:avahi"
+            ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" proto 6
+            ip route add default dev "$2" metric "$METRIC" scope link proto 17 ||:
+            ;;
+
+        CONFLICT|UNBIND|STOP)
+            ip route del default dev "$2" metric "$METRIC" scope link ||:
+            ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
+            ;;
+
+        *)
+            echo "Unknown event $1" >&2
+            exit 1
+            ;;
+    esac
+
+elif [ -x /bin/ifconfig -o -x /sbin/ifconfig ] ; then
+
+    # We have the old ifconfig tool
+
+    case "$1" in
+        BIND)
+            ifconfig "$2:avahi" inet "$3" netmask 255.255.0.0 broadcast 169.254.255.255 up
+            route add default dev "$2:avahi" metric "$METRIC" ||:
+            ;;
+
+        CONFLICT|STOP|UNBIND)
+            route del default dev "$2:avahi" metric "$METRIC" ||:
+            ifconfig "$2:avahi" down
+            ;;
+
+        *)
+            echo "Unknown event $1" >&2
+            exit 1
+            ;;
+    esac
+
+else
+
+    echo "No network configuration tool found." >&2
+    exit 1
+
+fi
+
+exit 0
@@ -0,0 +1 @@
+17	zeroconf
@@ -1 +1,2 @@
 alias cli='clish'
+alias cfg='sysrepocfg -f json'
@@ -0,0 +1,7 @@
+if [ -z "$CLISH" ]; then
+    cat <<EOF
+
+Run the command 'cli' for interactive OAM
+
+EOF
+fi
@@ -1,4 +1,5 @@
-net.ipv6.conf.all.forwarding=0
+net.ipv6.conf.all.forwarding=1
+net.ipv6.conf.default.forwarding=0
 net.ipv6.conf.all.autoconf=0
 net.ipv6.conf.default.autoconf=0
 net.ipv6.conf.default.keep_addr_on_down=1
@@ -18,7 +18,7 @@ class PadRoute:
    prefix = 30
    protocol = 10
    next_hop = 30
-    metric = 10
+    pref = 8

 class PadSoftware:
    name = 10
@@ -55,30 +55,44 @@ def get_json_data(default, indata, *args):
    return data

 class Route:
-    def __init__(self,data):
+    def __init__(self,data,ip):
        self.data = data
-        self.prefix = data.get('ietf-ipv4-unicast-routing:destination-prefix', '')
+        self.prefix = data.get(f'ietf-{ip}-unicast-routing:destination-prefix', '')
        self.protocol = data.get('source-protocol','')[14:]
-        self.metric = data.get('route-preference','')
-
-        interface = get_json_data(None, self.data, 'next-hop', 'outgoing-interface')
-        address = get_json_data(None, self.data, 'next-hop', 'ietf-ipv4-unicast-routing:next-hop-address')
-        special = get_json_data(None, self.data, 'next-hop', 'special-next-hop')
-        if interface:
-            self.next_hop = interface
-        elif address:
-            self.next_hop = address
-        elif special:
-            self.next_hop = special
+        self.pref = data.get('route-preference','')
+        self.next_hop = []
+        next_hop_list=get_json_data(None, self.data, 'next-hop', 'next-hop-list')
+        if next_hop_list:
+            for nh in next_hop_list["next-hop"]:
+                if(nh.get(f"ietf-{ip}-unicast-routing:address")):
+                    self.next_hop.append(nh[f"ietf-{ip}-unicast-routing:address"])
+                elif(nh.get("outgoing-interface")):
+                    self.next_hop.append(nh["outgoing-interface"])
+                else:
+                    self.next_hop.append("unspecified")
        else:
-            self.next_hop = "unspecified"
+            interface = get_json_data(None, self.data, 'next-hop', 'outgoing-interface')
+            address = get_json_data(None, self.data, 'next-hop', f'ietf-{ip}-unicast-routing:next-hop-address')
+            special = get_json_data(None, self.data, 'next-hop', 'special-next-hop')

+            if address:
+                self.next_hop.append(address)
+            elif interface:
+                self.next_hop.append(interface)
+            elif special:
+                self.next_hop.append(special)
+            else:
+                self.next_hop.append("unspecified")
    def print(self):
        row  = f"{self.prefix:<{PadRoute.prefix}}"
-        row += f"{self.next_hop:<{PadRoute.next_hop}}"
-        row += f"{self.metric:<{PadRoute.metric}}"
+        row += f"{self.next_hop[0]:<{PadRoute.next_hop}}"
+        row += f"{self.pref:>{PadRoute.pref}}  "
        row += f"{self.protocol:<{PadRoute.protocol}}"
        print(row)
+        for nh in self.next_hop[1:]:
+            row  = f"{'':<{PadRoute.prefix}}"
+            row += f"{nh:<{PadRoute.next_hop}}"
+            print(row)

 class Software:
    """Software bundle class """
@@ -369,24 +383,24 @@ def ietf_interfaces(json, name):
            sys.exit(1)
        pr_interface_list(json)

-def ietf_routing(json, protocol="ipv4"):
+def ietf_routing(json, ip="ipv4"):
    if not json.get("ietf-routing:routing"):
        print(f"Error, top level \"ietf-routing:routing\" missing")
        sys.exit(1)
-    routes = get_json_data({}, json, 'ietf-routing:routing','ribs', 'rib')[0]
-    routes = get_json_data(None, routes, "routes", "route")
-
    hdr = (f"{'PREFIX':<{PadRoute.prefix}}"
           f"{'NEXT-HOP':<{PadRoute.next_hop}}"
-           f"{'METRIC':<{PadRoute.metric}}"
+           f"{'PREF':>{PadRoute.pref}}  "
           f"{'PROTOCOL':<{PadRoute.protocol}}")

    print(Decore.invert(hdr))
-
-    if routes:
-        for r in routes:
-            route = Route(r)
-            route.print()
+    for rib in  get_json_data({}, json, 'ietf-routing:routing','ribs', 'rib'):
+        if rib["name"] != ip:
+            continue;
+        routes = get_json_data(None, rib, "routes", "route")
+        if routes:
+            for r in routes:
+                route = Route(r, ip)
+                route.print()

 def find_slot(_slots, name):
    for _slot in [Software(data) for data in _slots]:
@@ -0,0 +1,60 @@
+#!/usr/bin/python3
+# This script is used to transform the output from the show ip ospf commands and order
+# them to match the ietf-ospf YANG model. For example, interfaces is ordered under
+# area but FRR has areas in interfaces.
+#
+# This makes the parsing for the operational parts of YANG model more easy
+#
+
+import json
+import subprocess
+
+iface_out=subprocess.check_output("vtysh -c 'show ip ospf interface json'", shell=True)
+ospf_out=subprocess.check_output("vtysh -c 'show ip ospf json'", shell=True)
+neighbor_out=subprocess.check_output("vtysh -c 'show ip ospf neighbor detail json'", shell=True)
+interfaces=json.loads(iface_out)
+ospf=json.loads(ospf_out)
+neighbors=json.loads(neighbor_out)
+
+for ifname,iface in interfaces["interfaces"].items():
+    iface["name"] = ifname
+    iface["neighbors"] = []
+    for area_id in ospf["areas"]:
+        area_type=""
+
+        stub=False
+        if("NSSA" in iface["area"]):
+            iface_area_id = iface["area"][:-7]
+            area_type = "nssa-area"
+        elif("Stub" in iface["area"]):
+            iface_area_id = iface["area"][:-7]
+            iface["areaId"] = iface["area"][:-7]
+            area_type = "stub-area"
+        else:
+            iface_area_id = iface["area"]
+            area_type = "normal-area"
+
+        if(iface_area_id != area_id):
+            continue
+
+        ospf["areas"][area_id]["area-type"] = area_type
+        iface["area"] = iface_area_id
+
+        for nbrAddress,nbrDatas in neighbors["neighbors"].items():
+            for nbrData in nbrDatas:
+                nbrIfname=nbrData["ifaceName"].split(":")[0]
+                if(("NSSA" in nbrData.get("areaId", {})) or ("Stub" in nbrData.get("areaId", {}))):
+                    nbrData["areaId"] = nbrData["areaId"][:-7]
+
+                if ((nbrIfname != ifname) and (area_id != nbrData.get("areaId"))):
+                    #print(f'Continute {ifname} {nbrData.get("areaId")}')
+                    continue
+                nbrData["neighborIp"] = nbrAddress
+                iface["neighbors"].append(nbrData)
+
+        if(not ospf["areas"][area_id].get("interfaces", None)):
+            ospf["areas"][area_id]["interfaces"] = []
+        ospf["areas"][area_id]["interfaces"].append(iface)
+
+print(json.dumps(ospf))
+
@@ -63,7 +63,7 @@ ok

 step "Formatting $blk"
 [ -b $blk ] || { echo "$blk is not a block device" >&2; err; }
-/lib/infix/prod/fdisk $blk || err
+/libexec/infix/prod/fdisk $blk || err
 sleep 1
 ok

@@ -3,6 +3,8 @@
 import subprocess
 import json
 import sys # (built-in module)
+import argparse
+from datetime import datetime

 def json_get_yang_type(iface_in):
    if iface_in['link_type'] == "loopback":
@@ -116,49 +118,233 @@ def iface_is_dsa(iface_in):
        return False
    return True

-def add_ipv4_route(routes):
-    cmd = ['ip', '-4', '-s', '-d', '-j', 'route']
+def get_vpd_vendor_extensions(data):
+    vendor_extensions=[]
+    for ext in data:
+        vendor_extension = {}
+        vendor_extension["iana-enterprise-number"] = ext[0]
+        vendor_extension["extension-data"] = ext[1]
+        vendor_extensions.append(vendor_extension)
+    return vendor_extensions
+
+def get_vpd_data(vpd):
+        component={}
+        component["name"]=vpd.get("board")
+        component["infix-hardware:vpd-data"] = {}
+
+        if vpd.get("data"):
+            if vpd["data"].get("manufacture-date"):
+                component["mfg-date"]=datetime.strptime(vpd["data"]["manufacture-date"],"%m/%d/%Y %H:%M:%S").strftime("%Y-%m-%-dT%H:%M:%SZ")
+            if vpd["data"].get("manufacter"):
+                component["mfg-name"]=vpd["data"]["manufacturer"]
+            if vpd["data"].get("product-name"):
+                component["model-name"]=vpd["data"]["product-name"]
+            if vpd["data"].get("serial-number"):
+                component["serial-num"]=vpd["data"]["serial-number"]
+
+            # Set VPD-data entrys
+            for k,v in vpd["data"].items():
+                if vpd["data"].get(k):
+                    if k != "vendor-extension":
+                        component["infix-hardware:vpd-data"][k] = v
+                    else:
+                        vendor_extensions=get_vpd_vendor_extensions(v)
+                        component["infix-hardware:vpd-data"]["infix-hardware:vendor-extension"] = vendor_extensions
+        return component
+
+def add_hardware(hw_out, test):
+    cmd = ['cat', "/run/system.json"]
    data = run_json_cmd(cmd)
+    components=[]
+    for _,vpd in data.get("vpd").items():
+        component=get_vpd_data(vpd)
+        components.append(component)
+    insert(hw_out, "component", components)
+
+def get_routes(routes, proto, data):
    out={}
    out["route"] = []

+    if(proto == "ipv4"):
+        default = "0.0.0.0/0"
+        host_prefix_length="32"
+    else:
+        default = "::/0"
+        host_prefix_length="128"
    for d in data:
        new = {}
-        next_hop = {}
        if(d['dst'] == "default"):
-            d['dst'] = "0.0.0.0/0"
+            d['dst'] = default
        if(d['dst'].find('/') == -1):
-            d['dst'] = d['dst']+"/32"
-        new['ietf-ipv4-unicast-routing:destination-prefix'] = d['dst']
+            d['dst'] = d['dst']+"/"+host_prefix_length
+        new[f'ietf-{proto}-unicast-routing:destination-prefix'] = d['dst']
        new['source-protocol'] = "infix-routing:"+d['protocol']
        if d.get("metric"):
            new['route-preference'] = d['metric']
        else:
            new['route-preference'] = 0

-        if d['type'] == "blackhole":
-            next_hop['special-next-hop'] = "blackhole"
-        if d['type'] == "unreachable":
-            next_hop['special-next-hop'] = "unreachable"
-
-        if d['type'] == "unicast":
-            if(d.get("gateway")):
-                next_hop['ietf-ipv4-unicast-routing:next-hop-address'] = d['gateway']
-            elif(d.get("dev")):
-                next_hop['outgoing-interface'] = d['dev']
-
-        new['next-hop'] = next_hop
+        if d.get('nexthops'):
+            next_hops = []
+            for n in d.get('nexthops'):
+                next_hop = {}
+                if(n.get("dev")):
+                    next_hop['outgoing-interface'] = n['dev']
+                if(n.get("gateway")):
+                    next_hop[f'ietf-{proto}-unicast-routing:address'] = n['gateway']
+                next_hops.append(next_hop)
+            insert(new,'next-hop','next-hop-list','next-hop',next_hops)
+        else:
+            next_hop = {}
+            if d['type'] == "blackhole":
+                next_hop['special-next-hop'] = "blackhole"
+            if d['type'] == "unreachable":
+                next_hop['special-next-hop'] = "unreachable"
+            if d['type'] == "unicast":
+                if(d.get("dev")):
+                    next_hop['outgoing-interface'] = d['dev']
+                if(d.get("gateway")):
+                    next_hop[f'ietf-{proto}-unicast-routing:next-hop-address'] = d['gateway']
+            new['next-hop'] = next_hop

        out['route'].append(new)
    insert(routes, 'routes', out)

-def add_ip_link(ifname, iface_out):
-    cmd = ['ip', '-s', '-d', '-j', 'link', 'show', 'dev', ifname]
+def add_ipv4_route(routes, test):
+    if test:
+        cmd = ['cat', f"{test}/ip-4-route.json"]
+    else:
+        cmd = ['ip', '-4', '-s', '-d', '-j', 'route']
+
+    data = run_json_cmd(cmd)
+    get_routes(routes, "ipv4", data)
+
+def add_ipv6_route(routes, test):
+    if test:
+        cmd = ['cat', f"{test}/ip-6-route.json"]
+    else:
+        cmd = ['ip', '-6', '-s', '-d', '-j', 'route']
+    data = run_json_cmd(cmd)
+    get_routes(routes, "ipv6", data)
+
+def frr_to_ietf_neighbor_state(state):
+    state=state.split("/")[0]
+    if(state == "TwoWay"):
+        return "2-way"
+    return state.lower()
+
+def add_ospf_routes(ospf):
+    cmd = ['vtysh', '-c', "show ip ospf rout json"]
+    data = run_json_cmd(cmd)
+    routes=[]
+    for prefix,info in data.items():
+        if(prefix.find("/") == -1): # Ignore router IDs
+            continue
+
+        route={}
+        route["prefix"] = prefix
+
+        nexthops=[]
+        routetype=info["routeType"].split(" ")
+        if(len(routetype) > 1):
+            if(routetype[1]=="E1"):
+                route["route-type"] = "external-1"
+            elif(routetype[1]=="E2"):
+                route["route-type"] = "external-2"
+            elif(routetype[1]=="IA"):
+                route["route-type"] = "inter-area"
+        elif(routetype[0] == "N"):
+             route["route-type"] = "intra-area"
+        for hop in info["nexthops"]:
+            nexthop={}
+            if(hop["ip"] != " "):
+                nexthop["next-hop"] = hop["ip"]
+            else:
+                nexthop["outgoing-interface"] = hop["directlyAttachedTo"]
+            nexthops.append(nexthop)
+        route["next-hops"] = {}
+        route["next-hops"]["next-hop"] = nexthops
+        routes.append(route)
+    insert(ospf, "ietf-ospf:local-rib", "ietf-ospf:route", routes)
+
+def add_ospf(ospf):
+    cmd = ['/libexec/infix/ospf-status']
+    data = run_json_cmd(cmd)
+    ospf["ietf-ospf:router-id"] = data["routerId"]
+    ospf["ietf-ospf:address-family"] = "ipv4"
+    areas=[]
+
+    for area_id,values in data["areas"].items():
+        area={}
+        area["ietf-ospf:area-id"] = area_id
+        area["ietf-ospf:interfaces"] = {}
+        if values.get("area-type"):
+            area["ietf-ospf:area-type"] = values["area-type"]
+        interfaces=[]
+        for iface in values.get("interfaces", {}):
+            interface={}
+            interface["ietf-ospf:neighbors"] = {}
+            interface["name"]=iface["name"]
+            if(iface.get("drId")):
+               interface["dr-router-id"]=iface["drId"]
+            if(iface.get("drAddress")):
+               interface["dr-ip-addr"]=iface["drAddress"]
+            if(iface.get("bdrId")):
+               interface["bdr-router-id"]=iface["bdrId"]
+            if(iface.get("bdrAddress")):
+               interface["bdr-ip-addr"]=iface["bdrAddress"]
+            if(iface.get("timerPassiveIface")):
+                interface["passive"] = True
+            else:
+                interface["passive"] = False
+            interface["enabled"] = iface["ospfEnabled"]
+            if(iface["networkType"] == "POINTOPOINT"):
+                interface["interface-type"] = "point-to-point"
+            if(iface["networkType"] == "BROADCAST"):
+                interface["interface-type"] = "broadcast"
+
+            if iface.get("state"):
+                map = {
+                    "DependUpon":     "down", # Do not know what this is, never seen it and no entry in yang, but it listed before down in list in frr
+                    "Down":           "down",
+                    "Waiting":        "waiting",
+                    "Loopback":       "loopback",
+                    "Point-To-Point": "point-to-point",
+                    "DROther":        "dr-other",
+                    "Backup":         "bdr",
+                    "DR":             "dr"
+                }
+                val = map.get(iface["state"], "unknown")
+                interface["state"] = val
+
+            neighbors = []
+            for neigh in iface["neighbors"]:
+                neighbor={}
+                neighbor["neighbor-router-id"] = neigh["neighborIp"]
+                neighbor["address"] = neigh["ifaceAddress"]
+                neighbor["dr-router-id"] = neigh["routerDesignatedId"]
+                neighbor["bdr-router-id"] = neigh["routerDesignatedBackupId"]
+                neighbor["dead-timer"] = neigh["routerDeadIntervalTimerDueMsec"]
+                neighbor["state"]=frr_to_ietf_neighbor_state(neigh["nbrState"])
+                neighbors.append(neighbor)
+            interface["ietf-ospf:neighbors"] = {}
+            interface["ietf-ospf:neighbors"]["ietf-ospf:neighbor"] = neighbors
+            interfaces.append(interface)
+        area["ietf-ospf:interfaces"]["ietf-ospf:interface"] = interfaces
+        areas.append(area)
+    insert(ospf, "ietf-ospf:areas", "area", areas)
+    add_ospf_routes(ospf)
+
+def add_ip_link(ifname, iface_out, test):
+    if test:
+        cmd = ['cat', f"{test}/ip-link-show-dev-{ifname}.json"]
+    else:
+        cmd = ['ip', '-s', '-d', '-j', 'link', 'show', 'dev', ifname]

    data = run_json_cmd(cmd)
    if len(data) != 1:
        print(f"Error: expected ip link output to be array with length 1", file=sys.stderr)
-        sys,exit(1)
+        sys.exit(1)

    iface_in = data[0]

@@ -201,8 +387,11 @@ def add_ip_link(ifname, iface_out):
    if val is not None:
        insert(iface_out, "statistics", "in-octets", str(val))

-def add_ip_addr(ifname, iface_out):
-    cmd = ['ip', '-j', 'addr', 'show', 'dev', ifname]
+def add_ip_addr(ifname, iface_out, test):
+    if test:
+        cmd = ['cat', f"{test}/ip-addr-show-dev-{ifname}.json"]
+    else:
+        cmd = ['ip', '-j', 'addr', 'show', 'dev', ifname]

    data = run_json_cmd(cmd)
    if len(data) != 1:
@@ -248,8 +437,11 @@ def add_ip_addr(ifname, iface_out):
        insert(iface_out, "ietf-ip:ipv4", "address", inet)
        insert(iface_out, "ietf-ip:ipv6", "address", inet6)

-def add_ethtool_groups(ifname, iface_out):
-    cmd = ['ethtool', '--json', '-S', ifname, '--all-groups']
+def add_ethtool_groups(ifname, iface_out, test):
+    if test:
+        cmd = ['cat', f"{test}/ethtool-groups-{ifname}.json"]
+    else:
+        cmd = ['ethtool', '--json', '-S', ifname, '--all-groups']

    data = run_json_cmd(cmd)
    if len(data) != 1:
@@ -323,11 +515,15 @@ def add_ethtool_groups(ifname, iface_out):
        if found:
            frame['in-error-oversize-frames'] = str(tot)

-def add_ethtool_std(ifname, iface_out):
-    cmd = ['ethtool', ifname]
+def add_ethtool_std(ifname, iface_out, test):
    keys = ['Speed', 'Duplex', 'Auto-negotiation']
    result = {}

+    if test:
+        cmd = ['cat', f"{test}/ethtool-{ifname}.txt"]
+    else:
+        cmd = ['ethtool', ifname]
+
    lines = run_cmd(cmd)
    for line in lines:
        line = line.strip()
@@ -358,18 +554,20 @@ def add_ethtool_std(ifname, iface_out):
            insert(iface_out, "ieee802-ethernet-interface:ethernet", "speed", str(num))

 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print(f"usage: yanger <model> [params]", file=sys.stderr)
-        sys.exit(1)

-    model = sys.argv[1]
-    if(model == 'ietf-interfaces'):
+    parser = argparse.ArgumentParser(description="YANG data creator")
+    parser.add_argument("model", help="IETF Model")
+    parser.add_argument("-p", "--param", default=None, help="Model dependant parameter")
+    parser.add_argument("-t", "--test", default=None, help="Test data base path")
+    args = parser.parse_args()
+
+    if (args.model == 'ietf-interfaces'):
        # For now, we handle each interface separately, as this is how it's
        # currently implemented in sysrepo. I.e sysrepo will subscribe to
        # each individual interface and query it for YANG data.

-        if len(sys.argv) != 3:
-            print(f"usage: yanger ietf-interfaces IFNAME", file=sys.stderr)
+        if not args.param:
+            print(f"usage: yanger ietf-interfaces -p INTERFACE", file=sys.stderr)
            sys.exit(1)

        yang_data = {
@@ -378,28 +576,58 @@ if __name__ == "__main__":
            }
        }

-        ifname = sys.argv[2]
+        ifname = args.param
        iface_out = yang_data['ietf-interfaces:interfaces']['interface'][0]

-        add_ip_link(ifname, iface_out)
-        add_ip_addr(ifname, iface_out)
-        add_ethtool_groups(ifname, iface_out)
-        add_ethtool_std(ifname, iface_out)
-    elif(model == 'ietf-routing'):
+        add_ip_link(ifname, iface_out, args.test)
+        add_ip_addr(ifname, iface_out, args.test)
+        add_ethtool_groups(ifname, iface_out, args.test)
+        add_ethtool_std(ifname, iface_out, args.test)
+    elif (args.model == 'ietf-routing'):
        yang_data = {
            "ietf-routing:routing": {
                "ribs":  {
                    "rib": [{
                        "name": "ipv4",
-                        "address-family": "ipv4",
+                        "address-family": "ipv4"
+                    },
+                    {
+                        "name": "ipv6",
+                        "address-family": "ipv6"
                    }]
                }
            }
        }

        ipv4routes = yang_data['ietf-routing:routing']['ribs']['rib'][0]
-        add_ipv4_route(ipv4routes);
+        ipv6routes = yang_data['ietf-routing:routing']['ribs']['rib'][1]
+        add_ipv4_route(ipv4routes, args.test)
+        add_ipv6_route(ipv6routes, args.test)
+    elif (args.model == 'ietf-ospf'):
+        yang_data = {
+            "ietf-routing:routing": {
+                "control-plane-protocols": {
+                    "control-plane-protocol": [
+                    {
+                        "type": "ietf-ospf:ospfv2",
+                        "name": "default",
+                        "ietf-ospf:ospf": {
+                            "ietf-ospf:areas":
+                            {
+                            }
+                        }
+                    }]
+                }
+            }
+        }
+        add_ospf(yang_data['ietf-routing:routing']['control-plane-protocols']['control-plane-protocol'][0]["ietf-ospf:ospf"])
+    elif (args.model == 'ietf-hardware'):
+        yang_data = {
+            "ietf-hardware:hardware": {
+            }
+        }
+        add_hardware(yang_data["ietf-hardware:hardware"], args.test)
    else:
-        print(f"Unsupported model {model}", file=sys.stderr)
+        print(f"Unsupported model {args.model}", file=sys.stderr)
        sys.exit(1)
    print(json.dumps(yang_data, indent=2))
@@ -1,27 +1,30 @@
 test-dir := $(BR2_EXTERNAL_INFIX_PATH)/test
-INFIX_TESTS ?= $(test-dir)/case/all-repo.yaml $(test-dir)/case/all-unit.yaml \
-	$(test-dir)/case/all.yaml
+UNIT_TESTS ?= $(test-dir)/case/all-repo.yaml $(test-dir)/case/all-unit.yaml
+INFIX_TESTS ?= $(test-dir)/case/all.yaml

 test-env = $(test-dir)/env \
 	-f $(BINARIES_DIR)/infix-x86_64.img \
 	-p $(BINARIES_DIR)/infix-x86_64.pkg \
 	$(1) $(2)

-test-env-qeneth = $(call test-env,-q $(test-dir)/virt/dual,$(1))
+test-env-qeneth = $(call test-env,-q $(test-dir)/virt/quad,$(1))
 test-env-run    = $(call test-env,-C -t $(BINARIES_DIR)/qemu.dot,$(1))

 .PHONY: test-%

+test-unit:
+	$(test-dir)/env $(test-dir)/9pm/9pm.py $(UNIT_TESTS)
+
 test-qeneth:
 	$(call test-env-qeneth,\
-		$(BR2_EXTERNAL_INFIX_PATH)/9pm/9pm.py \
+		$(BR2_EXTERNAL_INFIX_PATH)/test/9pm/9pm.py \
 			$(INFIX_TESTS))
 test-qeneth-sh:
 	$(call test-env-qeneth,/bin/sh)

 test-run: | ~/.infix-test-venv
 	$(call test-env-run,\
-		$(BR2_EXTERNAL_INFIX_PATH)/9pm/9pm.py \
+		$(BR2_EXTERNAL_INFIX_PATH)/test/9pm/9pm.py \
 			$(INFIX_TESTS))
 test-run-sh: | ~/.infix-test-venv
 	$(call test-env-run,/bin/sh)
@@ -6,6 +6,7 @@ BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
 BR2_DL_DIR="${BR2_EXTERNAL_INFIX_PATH}/dl"
 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_TARGET_GENERIC_HOSTNAME="infix"
 BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
@@ -41,6 +42,7 @@ BR2_PACKAGE_UBOOT_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
+BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_NSS_MDNS=y
@@ -77,6 +79,7 @@ BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_TRACEROUTE=y
 BR2_PACKAGE_DIALOG=y
 BR2_PACKAGE_PDMENU=y
+BR2_PACKAGE_HTOP=y
 BR2_PACKAGE_IRQBALANCE=y
 BR2_PACKAGE_KMOD_TOOLS=y
 BR2_PACKAGE_PWGEN=y
@@ -90,6 +90,8 @@ BR2_PACKAGE_TRACEROUTE=y
 BR2_PACKAGE_ULOGD=y
 BR2_PACKAGE_BASH=y
 BR2_PACKAGE_BASH_COMPLETION=y
+BR2_PACKAGE_HTOP=y
+BR2_PACKAGE_SUDO=y
 BR2_PACKAGE_IRQBALANCE=y
 BR2_PACKAGE_KMOD_TOOLS=y
 BR2_PACKAGE_PWGEN=y
@@ -128,10 +130,12 @@ BR2_PACKAGE_FINIT_PLUGIN_RTC=y
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
+BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LOWDOWN=y
 BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_QUERIERD=y
+BR2_PACKAGE_LIBINPUT=y
 DISK_IMAGE_BOOT_BIN=y
 GNS3_APPLIANCE_RAM=512
 GNS3_APPLIANCE_IFNUM=10
@@ -0,0 +1,164 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
+BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
+BR2_DL_DIR="${BR2_EXTERNAL_INFIX_PATH}/dl"
+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_TARGET_GENERIC_HOSTNAME="infix"
+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_EXTERNAL_INFIX_PATH}/board/netconf/xattrs"
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+BR2_TARGET_GENERIC_GETTY_TERM="xterm"
+BR2_SYSTEM_DHCP="eth0"
+BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA"
+BR2_GENERATE_LOCALE="en_US en_CA"
+BR2_TARGET_TZ_INFO=y
+BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/rootfs"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh support/scripts/genimage.sh"
+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.5.11"
+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"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+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_JQ=y
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
+BR2_PACKAGE_DBUS_CXX=y
+BR2_PACKAGE_DBUS_GLIB=y
+BR2_PACKAGE_DBUS_TRIGGERD=y
+BR2_PACKAGE_EUDEV_RULES_GEN=y
+# BR2_PACKAGE_EUDEV_ENABLE_HWDB is not set
+BR2_PACKAGE_GPTFDISK=y
+BR2_PACKAGE_GPTFDISK_SGDISK=y
+BR2_PACKAGE_MDIO_TOOLS=y
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y
+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_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBOPENSSL_BIN=y
+BR2_PACKAGE_LIBCURL_CURL=y
+BR2_PACKAGE_NETOPEER2_CLI=y
+BR2_PACKAGE_NSS_MDNS=y
+BR2_PACKAGE_ONIGURUMA=y
+BR2_PACKAGE_AVAHI=y
+BR2_PACKAGE_AVAHI_DAEMON=y
+BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y
+BR2_PACKAGE_CHRONY=y
+BR2_PACKAGE_CONNTRACK_TOOLS=y
+BR2_PACKAGE_DNSMASQ=y
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_FPING=y
+BR2_PACKAGE_FRR=y
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_IPTABLES_NFTABLES=y
+BR2_PACKAGE_IPUTILS=y
+BR2_PACKAGE_LLDPD=y
+BR2_PACKAGE_NETCALC=y
+BR2_PACKAGE_NETCAT_OPENBSD=y
+BR2_PACKAGE_NETSNMP=y
+BR2_PACKAGE_NFTABLES=y
+BR2_PACKAGE_NMAP=y
+BR2_PACKAGE_NMAP_NCAT=y
+BR2_PACKAGE_NMAP_NMAP=y
+BR2_PACKAGE_NMAP_NPING=y
+BR2_PACKAGE_OPENRESOLV=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_SOCAT=y
+BR2_PACKAGE_TCPDUMP=y
+BR2_PACKAGE_TRACEROUTE=y
+BR2_PACKAGE_ULOGD=y
+BR2_PACKAGE_BASH_COMPLETION=y
+BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_HTOP=y
+BR2_PACKAGE_IRQBALANCE=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_SYSKLOGD=y
+BR2_PACKAGE_SYSKLOGD_LOGGER=y
+BR2_PACKAGE_WATCHDOGD=y
+BR2_PACKAGE_LESS=y
+BR2_PACKAGE_MG=y
+BR2_PACKAGE_NANO=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES=""
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="idbloader.img"
+BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
+BR2_PACKAGE_HOST_GENEXT2FS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_RAUC=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=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_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_STATD=y
+BR2_PACKAGE_FACTORY=y
+BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
+BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
+BR2_PACKAGE_FINIT_PLUGIN_MODULES_LOAD=y
+BR2_PACKAGE_FINIT_PLUGIN_RTC=y
+BR2_PACKAGE_FINIT_PLUGIN_TTY=y
+BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
+BR2_PACKAGE_IITO=y
+BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
+BR2_PACKAGE_LOWDOWN=y
+BR2_PACKAGE_TETRIS=y
+BR2_PACKAGE_QUERIERD=y
+# SIGN_ENABLED is not set
+# GNS3_APPLIANCE is not set
@@ -5,6 +5,7 @@ BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
 BR2_DL_DIR="${BR2_EXTERNAL_INFIX_PATH}/dl"
 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_TARGET_GENERIC_HOSTNAME="infix"
 BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
@@ -34,6 +35,7 @@ BR2_PACKAGE_UBOOT_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
+BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_NSS_MDNS=y
@@ -69,6 +71,7 @@ BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_TRACEROUTE=y
 BR2_PACKAGE_DIALOG=y
 BR2_PACKAGE_PDMENU=y
+BR2_PACKAGE_HTOP=y
 BR2_PACKAGE_IRQBALANCE=y
 BR2_PACKAGE_KMOD_TOOLS=y
 BR2_PACKAGE_PWGEN=y
@@ -86,7 +89,7 @@ BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_EDK2=y
 BR2_TARGET_GRUB2=y
 BR2_TARGET_GRUB2_X86_64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_gpt normal efi_gop configfile loadenv test terminfo terminal echo"
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 squash4 part_gpt normal efi_gop configfile loadenv test echo reboot net efinet tftp loopback"
 BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/grub-embed.cfg"
 BR2_TARGET_GRUB2_INSTALL_TOOLS=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -85,6 +85,8 @@ BR2_PACKAGE_TRACEROUTE=y
 BR2_PACKAGE_ULOGD=y
 BR2_PACKAGE_BASH=y
 BR2_PACKAGE_BASH_COMPLETION=y
+BR2_PACKAGE_HTOP=y
+BR2_PACKAGE_SUDO=y
 BR2_PACKAGE_IRQBALANCE=y
 BR2_PACKAGE_KMOD_TOOLS=y
 BR2_PACKAGE_PWGEN=y
@@ -131,6 +133,7 @@ BR2_PACKAGE_FINIT_PLUGIN_RTC=y
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
+BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LOWDOWN=y
 BR2_PACKAGE_TETRIS=y
@@ -122,7 +122,33 @@ 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* |

-DHCP address method is only available for *LAN* interfaces (ethernet, virtual ethernet (veth), bridge, etc.)
+Supported DHCP (request) options, configurability (Cfg) and defaults,
+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                              |
+|         |                  |         |                                                     |
+
+**Default:** `router`, `dns`, `domain`, `broadcast`, `ntpsrv`, `search`,
+             `address`, `staticroutes`, `msstaticroutes`
+
+> **Note:** DHCP address method is only available for *LAN* interfaces
+> (Ethernet, virtual Ethernet (veth), bridge, link aggregates, etc.)

 ### IPv6 Address Assignment

@@ -327,14 +353,47 @@ possible to specify use of a random identifier ([ietf-ip][ietf-ip-yang] YANG and
 Both the link-local address (fe80::) and the global address (2001:)
 have changed type to *random*. 

+### IPv4 forwarding
+To be able to route (static or dynamic) on the interface it is
+required to enable forwarding. This setting controlls 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:/>
+   ```
+
+### 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.
+
+| **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                  |
+
+   ```
+   admin@example:/config/> edit interface eth0
+   admin@example:/config/interface/eth0/> set ipv6 forwarding
+   admin@example:/config/interface/eth0/> leave
+   admin@example:/>
+   ```
 ## Routing support

-| **Yang Model**            | **Description**                                           |
-|:--------------------------|:----------------------------------------------------------|
-| ietf-routing              | Base routing model, required for all other routing models |
-| ietf-ipv4-unicast-routing | Static IPv4 unicast routing                               |
+| **Yang Model**            | **Description**                                                                       |
+|:--------------------------|:--------------------------------------------------------------------------------------|
+| ietf-routing              | Base model, used to set configuration and read operational status in the other models |
+| ietf-ipv4-unicast-routing | Static IPv4 unicast routing                                                           |
+| ietf-ipv6-unicast-routing | Static IPv6 unicast routing                                                           |
+| ietf-ospf                 | OSPF routing                                                                          |
+| infix-routing             | Infix deviations                                                                      |

-### Static routes
+### IPv4 Static routes
+Remember to enable [IPv4 forwarding](#IPv4-forwarding) for the interfaces.

    admin@example:/> configure
    admin@example:/config/> edit routing control-plane-protocol static name default
@@ -345,15 +404,121 @@ have changed type to *random*.
 > **Note:** The only name allowed for a control-plane-protocol is currently
 > *default*.  Meaning, you can only have one instance per routing protocol.

-### View IPv4 routing table

+### IPv6 Static routes
+
+    admin@example:/> configure
+    admin@example:/config/> edit routing control-plane-protocol static name default
+    admin@example:/config/routing/control-plane-protocol/static/name/default/> set ipv6 route 2001:db8:3c4d:200::/64 next-hop next-hop-address 2001:db8:3c4d:1::1
+    admin@example:/config/routing/control-plane-protocol/static/name/default/> leave
+    admin@example:/>
+
+> **Note:** The only name allowed for a control-plane-protocol is currently
+> *default*.  Meaning, you can only have one instance per routing protocol.
+
+### OSPFv2 Routing
+Infix supports OSPF dynamic routing for IPv4, i.e., OSPFv2.
+Remember to enable [IPv4 forwarding](#IPv4-forwarding) for the
+interfaces you want to run OSPFv2. 
+
+    admin@example:/config/> edit routing control-plane-protocol ospfv2 name default
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> set ospf area 0.0.0.0 interface e0 enabled true
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> leave
+    admin@example:/>
+
+> **Note:** The only instance name allowed for a
+> control-plane-protocol is currently *default*.  Meaning, you can
+> only have one instance per routing protocol.
+
+#### OSPF area types
+In addition to *regular* OSPF areas, area types *NSSA* and *Stub* are supported.
+
+To configure a NSSA area with summary routes:
+
+    admin@example:/config/> edit routing control-plane-protocol ospfv2 name default
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> set ospf area 0.0.0.1 area-type nssa-area
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> set ospf area 0.0.0.1 summary true
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> leave
+    admin@example:/>
+
+#### Bidirectional Forwarding Detection (BFD)
+It is possible to enable BFD per interface to speed up detection of
+link loss.
+
+    admin@example:/config/> edit routing control-plane-protocol ospfv2 name default
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/> set area 0.0.0.0 interface e0 bfd enabled true
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> leave
+    admin@example:/>
+
+#### OSPF interface settings
+
+We have already seen how to enable OSPF per interface (*enabled true*)
+and BFD for OSPF per interface (*bfd enabled true*). These and other
+OSPF interface settings are done in context of an OSFP area, e.g.,
+*area 0.0.0.0*. Available commands can be listed using the `?` mark.
+
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> edit ospf area 0.0.0.0
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/area/0.0.0.0/> edit interface e0 
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/area/0.0.0.0/interface/e0/> set ? 
+      bfd                  BFD interface configuration.
+      cost                 Interface's cost.
+      dead-interval        Interval after which a neighbor is declared down
+      enabled              Enables/disables the OSPF protocol on the interface.
+      hello-interval       Interval between Hello packets (seconds).  It must
+      interface-type       Interface type.
+      passive              Enables/disables a passive interface.  A passive
+      retransmit-interval  Interval between retransmitting unacknowledged Link
+      transmit-delay       Estimated time needed to transmit Link State Update
+    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/area/0.0.0.0/interface/e0/> set
+
+For example, setting the OSPF *interface type* to *point-to-point* for
+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/>
+
+
+#### Debug OSPFv2
+Using NETCONF and the YANG model *ietf-routing* it is possible to read the OSPF routing table, neighbors
+and more, that may be useful for debugging the OSPFv2 setup. The CLI
+has various OSPF status commands such as `show ospf neighbor`, `show
+ospf interface` and `show ospf routes`.
+
+    admin@example:/> show ospf neighbor 
+
+    Neighbor ID     Pri State           Up Time         Dead Time Address         Interface                        RXmtL RqstL DBsmL
+    10.1.1.2          1 Full/-          3h46m59s          30.177s 10.1.1.2        e0:10.1.1.1                          0     0     0
+    10.1.1.3          1 Full/-          3h46m55s          34.665s 10.1.1.3        e1:10.1.1.1                          0     0     0
+
+    admin@example:/>
+
+
+### View routing table
 The routing table can be viewed from the operational datastore over
 NETCONF or using the CLI:

-    admin@example:/> show routes
-    PREFIX                        NEXT-HOP                      METRIC    PROTOCOL
-    192.168.1.0/24                e0                                      kernel
-    192.168.200.0/24              192.168.1.1                   20        static
+#### IPv4 routing table
+
+    admin@example:/> show routes ipv4
+    PREFIX                        NEXT-HOP                      PREF  PROTOCOL
+    192.168.1.0/24                e0                                  kernel
+    192.168.200.0/24              192.168.1.1                     20  static
+    admin@example:/>
+
+#### IPv6 routing table
+
+    admin@example:/> show routes ipv6
+    PREFIX                        NEXT-HOP                      PREF  PROTOCOL
+    2001:db8:3c4d:50::/64         eth4                           256  kernel
+    fe80::/64                     eth5                           256  kernel
+    fe80::/64                     eth3                           256  kernel
+    fe80::/64                     eth1                           256  kernel
+    fe80::/64                     eth0                           256  kernel
+    fe80::/64                     eth2                           256  kernel
+    fe80::/64                     eth4                           256  kernel
+    admin@example:/>
+
+#### Source protocol

 The source protocol describes the origin of the route.

@@ -362,6 +527,7 @@ The source protocol describes the origin of the route.
 | kernel       | Added when setting a subnet address on an interface                  |
 | static       | User created static routes                                           |
 | dhcp         | Routes retrieved from DHCP                                           |
+| ospf         | Routes retreived from OSPFv2                                         |

 The YANG model *ietf-routing* support multiple ribs but only two are
 currently supported, namely `ipv4` and `ipv6`.
@@ -18,6 +18,9 @@ run-menuconfig: $(BUILD_DIR)/buildroot-config/mconf
 	CONFIG_="CONFIG_" BR2_CONFIG="$(BINARIES_DIR)/.config" \
 		$(BUILD_DIR)/buildroot-config/mconf $(BINARIES_DIR)/Config.in

+#
+# Buildroot package extensions
+#
 define FRR_POST_BUILD_HOOK
 	mkdir -p $(TARGET_DIR)/etc/iproute2/
 	cp -r $(@D)/tools/etc/iproute2/rt_protos.d/ $(TARGET_DIR)/etc/iproute2/
@@ -6,6 +6,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/faux/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/finit/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/ifupdown-ng/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/iito/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/package/keyack/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-infix/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/klish/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-sysrepo/Config.in"
@@ -8,11 +8,11 @@ run name:error :1 log:console norestart if:<run/bootstrap/failure> \
 	[S] /usr/libexec/confd/error --

 service name:confd log <run/bootstrap/success> \
-	[S12345789] sysrepo-plugind -f -p /run/confd.pid -n -v3 -- Configuration daemon
+	[S12345] sysrepo-plugind -f -p /run/confd.pid -n -v3 -- Configuration daemon

 # Bootstrap system with startup-config
 run name:startup log:prio:user.notice norestart <pid/confd> \
-	[S] /usr/libexec/confd/load -b startup-config \
+	[S] /usr/libexec/confd/load startup-config \
 	-- Loading startup-config

 # Run if loading startup-config fails for some reason
@@ -24,7 +24,7 @@ run name:error :2 log:console norestart if:<run/failure/failure> \
 	[S] /usr/libexec/confd/error --

 service name:netopeer notify:none log <pid/confd> \
-	[12345789] netopeer2-server -F -t 60 \
+	[12345] netopeer2-server -F -t 60 \
 	-- NETCONF server

 # Create initial /etc/resolv.conf after successful bootstrap
@@ -100,17 +100,17 @@ config BR2_PACKAGE_FINIT_WATCHDOG_DEV
 endif

 config BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG
-	bool "hotplug plugin (mdev/udev)"
+	bool "Start (udevd/mdev -df) at boot"
 	help
-	  By default, Finit builds and launches its hotplug plugin.
-	  It is responsible for detecting and starting the mdev tool,
-	  or udevd daemon.  The former exists in many BusyBox based
-	  systems and is called for "cold plugging".  The latter has
-	  many various incarnations and is mostly used for desktop
-	  systems.
+	  By default, Finit installs /lib/finit/system/10-hotplug.conf
+	  which detects if the system has udevd or mdev daemon.  They
+	  are both used to probe for devices, load modules and firmware
+	  to devices that request it.

 	  For lxc/docker application builds you do not need this.

+	  With this you probably do not need the modprobe plugin.
+
 config BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS
 	bool "hook scripts"
 	default n
@@ -141,6 +141,9 @@ config BR2_PACKAGE_FINIT_PLUGIN_MODPROBE

 	  For lxc/docker application builds you do not need this.

+	  You probably do not want this anymore, use udevd or mdev to
+	  probe devices, load modules and firmware instead.
+
 config BR2_PACKAGE_FINIT_PLUGIN_RTC
 	bool "RTC plugin"
 	help
@@ -1,8 +1,8 @@
 # From https://github.com/troglobit/finit/releases/
-sha256  84ce1623ee935dc5d2d615ca14ed087f4bb3c47207fda97f26b1346e4983a6b2  finit-4.6.tar.gz
+sha256  139adcb81ec8a5bb628249f92e2144b20f7e14c53aa56bb86a2fd42c5e7dca11  finit-4.7.tar.gz

 # Locally calculated
-sha256  3a2b964c1772d03ab17b73a389ecce9151e0b190a9247817a2c009b16d356422  LICENSE
+sha256  2fd62c0fe6ea6d1861669f4c87bda83a0b5ceca64f4baa4d16dd078fbd218c14  LICENSE

 # GIT Snapshot
 sha256  8c880293409cf566f6256bff193f985c50bd2eb99d2ff964dcaa9590251ed27e  finit-438d6b4e638418a2a22024a3cead2f47909d72b9.tar.gz
@@ -4,7 +4,7 @@
 #
 ################################################################################

-FINIT_VERSION = 4.6
+FINIT_VERSION = 4.7
 FINIT_SITE = https://github.com/troglobit/finit/releases/download/$(FINIT_VERSION)
 FINIT_LICENSE = MIT
 FINIT_LICENSE_FILES = LICENSE
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KEYACK
+	bool "keyack"
+	help
+	  Blocks until a specific key is pressed and released. Useful
+	  when you want a user to confirm some action by physically
+	  pressing a button.
@@ -0,0 +1,24 @@
+################################################################################
+#
+# keyack
+#
+################################################################################
+
+KEYACK_VERSION = 1.0
+KEYACK_LICENSE = MIT
+KEYACK_LICENSE_FILES = LICENSE
+KEYACK_SITE_METHOD = local
+KEYACK_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/keyack
+KEYACK_REDISTRIBUTE = NO
+
+define KEYACK_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		LDLIBS="$(TARGET_LDFLAGS)"
+endef
+
+define KEYACK_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" install
+endef
+
+$(eval $(generic-package))
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256  9d9d33b873917ca5d0bdcc47a36d2fd385971ab0c045d1472fcadf95ee5bcf5b  LICENCE
-sha256  468b9a4da872257795964e2fff17fbfc5a592070a98a0a51e5f54464171ee73f  klish-plugin-sysrepo-fa1228a7ff2b3500b8c1bc6f6f0d28bddd2d0a91-br1.tar.gz
+sha256  59ce3461a002a8113be030ef476940027f5e0e73dbe8afc56739cda6b55349ab  klish-plugin-sysrepo-f828a96efb12c3f7f8807aae089561fd69f4a6af-br1.tar.gz
@@ -4,7 +4,7 @@
 #
 ################################################################################

-KLISH_PLUGIN_SYSREPO_VERSION = fa1228a7ff2b3500b8c1bc6f6f0d28bddd2d0a91
+KLISH_PLUGIN_SYSREPO_VERSION = f828a96efb12c3f7f8807aae089561fd69f4a6af
 KLISH_PLUGIN_SYSREPO_SITE = https://github.com/kernelkit/klish-plugin-sysrepo.git
 #KLISH_PLUGIN_SYSREPO_VERSION = cdd3eb51a7f7ee0ed5bd925fa636061d3b1b85fb
 #KLISH_PLUGIN_SYSREPO_SITE = https://src.libcode.org/pkun/klish-plugin-sysrepo.git
@@ -1 +1 @@
-service <!> log [2345789] /usr/bin/klishd -d -- CLI backend daemon
+service <!> log [2345] /usr/bin/klishd -d -- CLI backend daemon
@@ -21,9 +21,9 @@ define SKELETON_INIT_FINIT_GETTY
 		if [ $(SYSTEM_GETTY_BAUDRATE) -eq 0 ]; then \
 			SYSTEM_GETTY_BAUDRATE=""; \
 		fi; \
-		echo "tty [12345] $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) noclear passenv"; \
+		echo "tty [12345789] $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) noclear passenv"; \
 	else \
-		echo "tty [12345] /sbin/getty -L $(SYSTEM_GETTY_OPTIONS) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_TERM)"; \
+		echo "tty [12345789] /sbin/getty -L $(SYSTEM_GETTY_OPTIONS) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_TERM)"; \
 	fi
 endef

@@ -1 +1 @@
-service [2345789] avahi-dnsconfd -s -- Avahi unicast DNS configuration daemon
+service [2345] avahi-dnsconfd -s -- Avahi unicast DNS configuration daemon
@@ -1 +1 @@
-service [2345789] name:mdns avahi-daemon -s -- Avahi mDNS-SD daemon
+service [2345] name:mdns avahi-daemon -s -- Avahi mDNS-SD daemon
@@ -1,2 +1,2 @@
 # Requires /etc/chrony.conf to start, see https://chrony.tuxfamily.org/doc/3.4/chrony.conf.html
-service [2345789] <!> env:-/etc/default/chronyd chronyd -n $CHRONY_ARGS -- Chrony NTP v3/v4 daemon
+service [2345] <!> env:-/etc/default/chronyd chronyd -n $CHRONY_ARGS -- Chrony NTP v3/v4 daemon
@@ -1 +1 @@
-service [2345789] env:-/etc/default/conntrackd conntrackd $CONNTRACKD_ARGS -- Connection tracking daemon
+service [2345] env:-/etc/default/conntrackd conntrackd $CONNTRACKD_ARGS -- Connection tracking daemon
@@ -1 +1 @@
-service [S12345789] <pid/syslogd> dnsmasq -k -u root -- DHCP/DNS proxy
+service [S12345] <pid/syslogd> dnsmasq -k -u root -- DHCP/DNS proxy
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> babled -A 127.0.0.1 -u frr -g frr -- Babel routing daemon
+service [2345] log:null <!pid/zebra> babled -A 127.0.0.1 -u frr -g frr -- Babel routing daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> bfdd -A 127.0.0.1 -u frr -g frr -- BFD daemon
+service [2345] log:null <!pid/zebra> bfdd -A 127.0.0.1 -u frr -g frr -- BFD daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> bgpd -A 127.0.0.1 -u frr -g frr -- BGP daemon
+service [2345] log:null <!pid/zebra> bgpd -A 127.0.0.1 -u frr -g frr -- BGP daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> eigrpd -A 127.0.0.1 -u frr -g frr -- EIGRP daemon
+service [2345] log:null <!pid/zebra> eigrpd -A 127.0.0.1 -u frr -g frr -- EIGRP daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> isisd -A 127.0.0.1 -u frr -g frr -- IS-IS daemon
+service [2345] log:null <!pid/zebra> isisd -A 127.0.0.1 -u frr -g frr -- IS-IS daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> ldpd -A 127.0.0.1 -u frr -g frr -- LDP daemon
+service [2345] log:null <!pid/zebra> ldpd -A 127.0.0.1 -u frr -g frr -- LDP daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> ospf6d -A 127.0.0.1 -u frr -g frr -- OSPF IPv6 daemon
+service [2345] log:null <!pid/zebra> ospf6d -A 127.0.0.1 -u frr -g frr -- OSPF IPv6 daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> ospfd -A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf-- OSPF daemon
+service [2345] log:null <!pid/zebra> ospfd -A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf -- OSPF daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> pathd -A 127.0.0.1 -u frr -g frr -- PCEP daemon
+service [2345] log:null <!pid/zebra> pathd -A 127.0.0.1 -u frr -g frr -- PCEP daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> pim6d -A 127.0.0.1 -u frr -g frr -- PIM6 daemon
+service [2345] log:null <!pid/zebra> pim6d -A 127.0.0.1 -u frr -g frr -- PIM6 daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> pimd -A 127.0.0.1 -u frr -g frr -- PIM daemon
+service [2345] log:null <!pid/zebra> pimd -A 127.0.0.1 -u frr -g frr -- PIM daemon
@@ -1 +1 @@
-service [2345789] log:null <pid/zebra> ripd -A 127.0.0.1 -u frr -g frr -- RIP daemon
+service [2345] log:null <pid/zebra> ripd -A 127.0.0.1 -u frr -g frr -- RIP daemon
@@ -1 +1 @@
-service [2345789] log:null <pid/zebra> ripngd -A 127.0.0.1 -u frr -g frr -- RIP IPv6 daemon
+service [2345] log:null <pid/zebra> ripngd -A 127.0.0.1 -u frr -g frr -- RIP IPv6 daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> staticd -A 127.0.0.1 -u frr -g frr -f /etc/frr/staticd.conf -- Static routing daemon
+service [2345] log:null <!pid/zebra> staticd -A 127.0.0.1 -u frr -g frr -f /etc/frr/staticd.conf -- Static routing daemon
@@ -1 +1 @@
-service [2345789] log:null <!pid/zebra> vrrpd -A 127.0.0.1 -u frr -g frr -- VRRP daemon
+service [2345] log:null <!pid/zebra> vrrpd -A 127.0.0.1 -u frr -g frr -- VRRP daemon
@@ -1 +1 @@
-service [2345789] <!> pid:!/run/frr/zebra.pid zebra -A 127.0.0.1 -u frr -g frr -- Zebra routing daemon
+service [2345] <!> pid:!/run/frr/zebra.pid zebra -A 127.0.0.1 -u frr -g frr -- Zebra routing daemon
@@ -1 +1 @@
-service [2345789] env:-/etc/default/lldpd lldpd -d $LLDPD_ARGS -- LLDP daemon (IEEE 802.1ab)
+service [2345] env:-/etc/default/lldpd lldpd -d $LLDPD_ARGS -- LLDP daemon (IEEE 802.1ab)
@@ -1,4 +1,4 @@
 # Make sure to configure the bridge to run on before starting mstpd
 # Note: all 'sysv' type services are handed an extra 'start' or 'stop'
 # argument when starting and stopping.
-sysv name:mstpd [0123456789] pid:!/run/mstpd.pid bridge-stp br0 -- MSTP daemon
+sysv name:mstpd [0123456] pid:!/run/mstpd.pid bridge-stp br0 -- MSTP daemon
@@ -1 +1 @@
-service [2345789] env:-/etc/default/querierd querierd -sn $QUERIERD_ARGS -- Multicast query daemon
+service [2345] env:-/etc/default/querierd querierd -sn $QUERIERD_ARGS -- Multicast query daemon
@@ -1,2 +1,2 @@
-service [2345789] env:-/etc/default/smcrouted \
+service [2345] env:-/etc/default/smcrouted \
 	smcrouted -ns $SMCROUTE_OPTS $SMCROUTE_ARGS -- Static multicast routing daemon
@@ -1,2 +1,12 @@
-service name:syslogd env:-/etc/default/sysklogd <run/udevadm:5/success> \
+# This service provides the same sync condition as the BusyBox syslogd,
+# which allows us to create a barrier at boot for services that might
+# otherwise leak log messages to console.
+
+# 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 env:-/etc/default/sysklogd <run/udevadm:5/success> \
+	[S0123456789] syslogd -F $SYSLOGD_ARGS -- System log daemon
+service if:mdev  env:-/etc/default/sysklogd <run/coldplug/success> \
+	[S0123456789] syslogd -F $SYSLOGD_ARGS -- System log daemon
+service if:mdevd env:-/etc/default/sysklogd <run/coldplug/success> \
 	[S0123456789] syslogd -F $SYSLOGD_ARGS -- System log daemon
@@ -1,4 +1,5 @@
-# Finit has a built-in watchdog daemon that starts very early
-# to take care of the hand-over from any bootloader.  Therefore
-# watchdogd does not need to start until the default runlevel.
-service [0123456789] watchdogd -xns -- System watchdog daemon
+# Finit comes with a bundled mini-watchdogd, for Infix this is disabled,
+# so we want to start watchdogd as soon as possible.
+rlimit rtprio 99
+service cgroup.root env:-/etc/default/watchdogd \
+	[S0123456789] watchdogd -xns $WATCHDOGD_ARGS -- System watchdog daemon
@@ -1 +1 @@
-service name:statd log [S12345789] <pid/confd> statd -f -p /run/statd.pid -n -- Status daemon
+service name:statd log [S12345] <pid/confd> statd -f -p /run/statd.pid -n -- Status daemon
@@ -0,0 +1,61 @@
+From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001
+From: Marco Felsch <m.felsch@pengutronix.de>
+Date: Wed, 9 Nov 2022 12:59:09 +0100
+Subject: [PATCH] feat(build): add support for new binutils versions
+
+Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces
+of a new warning when linking the bl*.elf in the form:
+
+  ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack
+  ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions
+  ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions
+
+These new warnings are enbaled by default to secure elf binaries:
+ - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
+ - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774
+
+Fix it in a similar way to what the Linux kernel does, see:
+https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/
+
+Following the reasoning there, we set "-z noexecstack" for all linkers
+(although LLVM's LLD defaults to it) and optional add
+--no-warn-rwx-segments since this a ld.bfd related.
+
+Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617
+Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
+Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c
+---
+ Makefile | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 1ddb7b844..470956b19 100644
+--- a/Makefile
+++ b/Makefile
+@@ -416,6 +416,8 @@ endif
+ 
+ GCC_V_OUTPUT		:=	$(shell $(CC) -v 2>&1)
+ 
+TF_LDFLAGS		+=	-z noexecstack
+
+ # LD = armlink
+ ifneq ($(findstring armlink,$(notdir $(LD))),)
+ TF_LDFLAGS		+=	--diag_error=warning --lto_level=O1
+@@ -442,7 +444,10 @@ TF_LDFLAGS		+=	$(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH)))
+ 
+ # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other
+ else
+-TF_LDFLAGS		+=	--fatal-warnings -O1
+# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we
+# are not loaded by a elf loader.
+TF_LDFLAGS		+=	$(call ld_option, --no-warn-rwx-segments)
+TF_LDFLAGS		+=	-O1
+ TF_LDFLAGS		+=	--gc-sections
+ # ld.lld doesn't recognize the errata flags,
+ # therefore don't add those in that case
+-- 
+2.30.2
+
@@ -1,36 +0,0 @@
-commit 5db2fb2c325807c67b38d18b454bbfc55b51b77f
-Author: Joachim Wiberg <troglobit@gmail.com>
-Date:   Sat May 20 10:08:31 2023 +0200
-
-    initctl: let -f force-skip check for built-in service
-    
-    When calling `initctl -b create` from a start script at bootstrap you
-    risk blocking the boot since Finit currently cannot reply to IPC during
-    that period.
-    
-    This patch allows -f to override this builtin check for the following
-    initctl commands:
-    
-     - touch
-     - show
-     - edit
-     - create
-     - delete
-    
-    Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
-
-diff --git a/src/serv.c b/src/serv.c
-index 570f5ac..2029ddd 100644
--- a/src/serv.c
-+++ b/src/serv.c
-@@ -41,6 +41,10 @@ static int is_builtin(char *arg)
- {
- 	svc_t *svc;
- 
-+	/* skip check, we may be in non-responsive bootstrap */
-+	if (iforce)
-+		return 0;
-+
- 	svc = client_svc_find(arg);
- 	if (!svc)
- 		return 0;
@@ -1,58 +0,0 @@
-From 6f0d448765d61a741add34baec422c24e357e7dc Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Tue, 27 Jun 2023 12:18:09 +0200
-Subject: [PATCH] Fix #227: delayed service_kill() may stall shutdown/reboot
-Organization: Addiva Elektronik
-
-This turns out to be the root-cause of #227.  Finit is waiting forever
-for proceeses to stop at shutdown/reboot, while a subreaper has already
-collected the PID, or Finit for some reason did not collect the PID.
-
-When the process timeout calls service_kill() we now check if the kernel
-actually knows of this process or not.  If it's already been collected,
-we can notify Finit of this by calling service_monitor() to clean up the
-'svc' and in turn call sm_step() to finalize the state transition.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- src/service.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/src/service.c b/src/service.c
-index 21acd28..ddd7e4f 100644
--- a/src/service.c
-+++ b/src/service.c
-@@ -850,17 +850,26 @@ fail:
-  */
- static void service_kill(svc_t *svc)
- {
-+	char *nm, *id = svc_ident(svc, NULL, 0);
-+
- 	service_timeout_cancel(svc);
- 
- 	if (svc->pid <= 1) {
- 		/* Avoid killing ourselves or all processes ... */
-		dbg("%s: Aborting SIGKILL, already terminated.", svc_ident(svc, NULL, 0));
-+		dbg("%s: Aborting SIGKILL, already terminated.", id);
- 		return;
- 	}
- 
-	dbg("%s: Sending SIGKILL to process group %d", pid_get_name(svc->pid, NULL, 0), svc->pid);
-	logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], sending SIGKILL ...",
-	      svc_ident(svc, NULL, 0), svc->pid);
-+	nm = pid_get_name(svc->pid, NULL, 0);
-+	if (!nm) {
-+		/* PID possibly monitored by someone else? */
-+		dbg("%s: Aborting SIGKILL, PID[%d] no longer exists.", id, svc->pid);
-+		service_monitor(svc->pid, 0);
-+		return;
-+	}
-+
-+	dbg("%s: Sending SIGKILL to process group %d", nm, svc->pid);
-+	logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], sending SIGKILL ...", id, svc->pid);
- 	if (runlevel != 1)
- 		print_desc("Killing ", svc->desc);
- 
-- 
-2.34.1
-
@@ -0,0 +1,78 @@
+From cbf96a1de0feee85f8a4014f29f9f3b7558dbff0 Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Sun, 10 Dec 2023 16:42:29 +0100
+Subject: [PATCH 1/2] Silence 'not available' log messages for nowarn
+ run/task/service
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+---
+ src/service.c | 4 ++--
+ src/svc.c     | 5 +++--
+ src/svc.h     | 2 +-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/service.c b/src/service.c
+index c6ee18d0..1ee54e5a 100644
+--- a/src/service.c
+++ b/src/service.c
+@@ -1620,7 +1620,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
+ 		strlcat(ident, id, sizeof(ident));
+ 	}
+ 
+-	if (ifstmt && !svc_ifthen(1, ident, ifstmt))
+	if (ifstmt && !svc_ifthen(1, ident, ifstmt, nowarn))
+ 		return 0;
+ 
+ 	levels = conf_parse_runlevels(runlevels);
+@@ -2027,7 +2027,7 @@ void service_mark_unavail(void)
+ 		if (!svc->ifstmt[0])
+ 			continue;
+ 
+-		if (!svc_ifthen(1, svc_ident(svc, buf, sizeof(buf)), svc->ifstmt))
+		if (!svc_ifthen(1, svc_ident(svc, buf, sizeof(buf)), svc->ifstmt, svc->nowarn))
+ 			svc_mark(svc);
+ 	}
+ }
+diff --git a/src/svc.c b/src/svc.c
+index 001993de..6bb90049 100644
+--- a/src/svc.c
+++ b/src/svc.c
+@@ -649,7 +649,7 @@ int svc_enabled(svc_t *svc)
+ 		return 0;
+ 	}
+ 
+-	if (!svc_ifthen(0, NULL, svc->ifstmt)) {
+	if (!svc_ifthen(0, NULL, svc->ifstmt, svc->nowarn)) {
+ //		dbg("ifthen:%s>", svc->ifstmt[0] ? svc->ifstmt : "<");
+ 		return 0;
+ 	}
+@@ -704,11 +704,12 @@ int svc_conflicts(svc_t *svc)
+  * @is_conf: Set when called by service_mark_unavail()
+  * @ident:   svc_t identififcation (name:id)
+  * @stmt:    if: statement from .conf file
+ * @quiet:   If non-zero, do not warn in syslog
+  *
+  * Returns:
+  * %TRUE(1) yes, use this svc_t, %FALSE(0) prune
+  */
+-int svc_ifthen(int is_conf, const char *ident, char *stmt)
+int svc_ifthen(int is_conf, const char *ident, char *stmt, int quiet)
+ {
+ 	char stmts[MAX_IDENT_LEN];
+ 	int not = 0;
+diff --git a/src/svc.h b/src/svc.h
+index f94a30e5..520aabcc 100644
+--- a/src/svc.h
+++ b/src/svc.h
+@@ -249,7 +249,7 @@ void	    svc_prune_bootstrap	   (void);
+ void        svc_enable             (svc_t *svc);
+ int         svc_enabled            (svc_t *svc);
+ int         svc_conflicts          (svc_t *svc);
+-int         svc_ifthen             (int is_conf, const char *ident, char *stmt);
+int         svc_ifthen             (int is_conf, const char *ident, char *stmt, int quiet);
+ 
+ int         svc_parse_jobstr       (char *str, size_t len, void *user_data, int (*found)(svc_t *, void *), int (not_found)(char *, char *, void *));
+ 
+-- 
+2.34.1
+
@@ -0,0 +1,34 @@
+From ed88469276c569acd9ef16bcc38cd80afd8dea52 Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Sun, 10 Dec 2023 17:32:19 +0100
+Subject: [PATCH 2/2] Actually silence the log message, missing hunk for
+ previous change
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+---
+ src/svc.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/svc.c b/src/svc.c
+index 6bb90049..773f0ab6 100644
+--- a/src/svc.c
+++ b/src/svc.c
+@@ -759,11 +759,13 @@ int svc_ifthen(int is_conf, const char *ident, char *stmt, int quiet)
+ 
+ 		svc = svc_find_by_str(stmt);
+ 		if (not && svc) {
+-			logit(LOG_NOTICE, "skipping %s, %s already loaded.", ident, svc_ident(svc, NULL, 0));
+			if (!quiet)
+				logit(LOG_NOTICE, "skipping %s, %s already loaded.", ident, svc_ident(svc, NULL, 0));
+ 			return 0;
+ 		}
+ 		if (!not && !svc) {
+-			logit(LOG_NOTICE, "skipping %s, %s not available.", ident, stmt);
+			if (!quiet)
+				logit(LOG_NOTICE, "skipping %s, %s not available.", ident, stmt);
+ 			return 0;
+ 		}
+ 	}
+-- 
+2.34.1
+
--- a/Show More
+++ b/Show More