Merge pull request #986 from kernelkit/mvpp2-tcam-fix

Fix `mvpp2` TCAM memory corruption

.gitignore

@@ -8,3 +8,4 @@
 /test/.venv
 /test/.log
 /local.mk
+/test/spec/Readme.adoc

README.md

@@ -27,13 +27,13 @@ it maintenance-free.  Configuration and data, e.g, containers, is stored
 on separate partitions to ensure complete separation from system files
 and allow for seamless backup, restore, and provisioning.
 
-In itself Infix is perfectly suited for dedicated networking tasks and
-native support for Docker containers provides a versatile platform that
-can easily be adapted to any customer need.  Be it legacy applications,
-network protocols, process monitoring, or edge data analysis, it can run
-close to end equipment.  Either directly connected on dedicated Ethernet
-ports or indirectly using virtual network cables to exist on the same
-LAN as other connected equipment.
+In itself, Infix is perfectly suited for dedicated networking tasks, and
+with native support for Docker containers, the operating system provides
+a versatile platform that can easily be adapted to any customer need.
+Be it legacy applications, network protocols, process monitoring, or
+edge data analysis, it can run close to end equipment.  Either directly
+connected on dedicated Ethernet ports or indirectly using virtual
+network cables to exist on the same LAN as other connected equipment.
 
 The simple design of Infix provides complete control over both system
 and data, minimal cognitive burden, and makes it incredibly easy to get

board/common/qemu/Config.in.in

@@ -189,7 +189,7 @@ config QEMU_CLOCK
 comment "Networking"
 
 choice
-     prompt "Mode"
+     prompt "Network Mode"
      default QEMU_NET_USER
 
 config QEMU_NET_NONE
@@ -204,6 +204,9 @@ config QEMU_NET_USER
 config QEMU_NET_TAP
      bool "TAP"
 
+config QEMU_NET_ROCKER
+     bool "Rocker"
+
 endchoice
 
 config QEMU_NET_MODEL
@@ -229,3 +232,8 @@ config QEMU_NET_TAP_N
 	int "Number of TAPs"
 	depends on QEMU_NET_TAP
 	default 1
+
+config QEMU_NET_PORTS
+	int "Number of Rocker switch ports"
+	depends on QEMU_NET_ROCKER
+	default 10

board/common/qemu/qemu.sh

@@ -17,9 +17,10 @@
 #
 #    ./qemu.sh -h
 #
+# shellcheck disable=SC3037
 
 # Local variables
-imgdir=$(readlink -f $(dirname "$0"))
+imgdir=$(readlink -f "$(dirname "$0")")
 prognm=$(basename "$0")
 
 usage()
@@ -30,6 +31,7 @@ usage()
     echo "Options:"
     echo "  -c     Run menuconfig to change Qemu settings"
     echo "  -h     This help text"
+    echo "  -k     Keep generated qemu.run script (name shown at end)"
     echo
     echo "Arguments:"
     echo "  ARGS1  Args before the '--' separator are for kernel space"
@@ -54,19 +56,20 @@ die()
 
 load_qemucfg()
 {
-    local tmp=$(mktemp -p /tmp)
+    tmp=$(mktemp -p /tmp)
 
-    grep ^CONFIG_QEMU_ $1 >$tmp
-    .  $tmp
-    rm $tmp
+    grep ^CONFIG_QEMU_ "$1" >"$tmp"
+    # shellcheck disable=SC1090
+    .  "$tmp"
+    rm "$tmp"
 
     [ "$CONFIG_QEMU_MACHINE" ] || die "Missing QEMU_MACHINE"
     [ "$CONFIG_QEMU_ROOTFS"  ] || die "Missing QEMU_ROOTFS"
 
-    [ "$CONFIG_QEMU_KERNEL" -a "$CONFIG_QEMU_BIOS" ] \
+    [ -n "$CONFIG_QEMU_KERNEL" ] && [ -n "$CONFIG_QEMU_BIOS" ] \
 	&& die "QEMU_KERNEL conflicts with QEMU_BIOS"
 
-    [ ! "$CONFIG_QEMU_KERNEL" -a ! "$CONFIG_QEMU_BIOS" ] \
+    [ -z "$CONFIG_QEMU_KERNEL" ] && [ -z "$CONFIG_QEMU_BIOS" ] \
 	&& die "QEMU_KERNEL or QEMU_BIOS must be set"
 }
 
@@ -93,7 +96,7 @@ append_args()
 
     if [ "$CONFIG_QEMU_ROOTFS_INITRD" = "y" ]; then
 	# Size of initrd, rounded up to nearest kb
-	local size=$((($(stat -c %s $CONFIG_QEMU_ROOTFS) + 1023) >> 10))
+	size=$((($(stat -c %s "$CONFIG_QEMU_ROOTFS") + 1023) >> 10))
 	echo -n "root=/dev/ram0 ramdisk_size=${size} "
     elif [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
 	echo -n "root=PARTLABEL=primary "
@@ -198,13 +201,24 @@ host_args()
 
 net_dev_args()
 {
-    local name="e$1"
-    local mac=$(printf "02:00:00:00:00:%02x" $1)
+    name="e$1"
+    mac=$(printf "02:00:00:00:00:%02x" "$1")
 
     echo -n "-device $CONFIG_QEMU_NET_MODEL,netdev=$name,mac=$mac "
     echo "$name	$mac" >>"$mactab"
 }
 
+rocker_port_args()
+{
+    sw=$1
+    port=$2
+    name="sw${sw}p${port}"
+    mac=$(printf "02:00:00:00:%02x:%02x" "$sw" "$port")
+
+    echo -n "-netdev tap,id=$name,ifname=$name,script=no,downscript=no "
+    echo "$name	$mac" >> "$mactab"
+}
+
 net_args()
 {
     # Infix will pick up this file via fwcfg and install it to /etc
@@ -216,14 +230,25 @@ net_args()
 	echo -n "-netdev bridge,id=e1,br=$CONFIG_QEMU_NET_BRIDGE_DEV "
 	net_dev_args 1
     elif [ "$CONFIG_QEMU_NET_TAP" = "y" ]; then
-	for i in $(seq 1 $(($CONFIG_QEMU_NET_TAP_N))); do
+	for i in $(seq 1 "$CONFIG_QEMU_NET_TAP_N"); do
 	    echo -n "-netdev tap,id=e$i,ifname=qtap$i "
-	    net_dev_args $i
+	    net_dev_args "$i"
+	done
+    elif [ "$CONFIG_QEMU_NET_ROCKER" = "y" ]; then
+	sw=sw0			# Only single switch support atm.
+	echo -n "-device '{\"driver\":\"rocker\", \"name\":\"${sw}\", "
+	echo -n "\"fp_start_macaddr\":\"02:00:00:00:00:01\", "
+	echo -n "\"ports\":["
+	for i in $(seq 1 "$CONFIG_QEMU_NET_PORTS"); do
+	    [ "$i" -gt 1 ] && echo -n ", "
+	    echo -n "\"${sw}p${i}\""
+	done
+	echo -n "]}' "
+	for i in $(seq 1 "$CONFIG_QEMU_NET_PORTS"); do
+	    rocker_port_args 0 "$i"
 	done
     elif [ "$CONFIG_QEMU_NET_USER" = "y" ]; then
-	local useropts=
 	[ "$CONFIG_QEMU_NET_USER_OPTS" ] && useropts=",$CONFIG_QEMU_NET_USER_OPTS"
-
 	echo -n "-netdev user,id=e1${useropts} "
 	net_dev_args 1
     else
@@ -301,8 +326,7 @@ run_qemu()
 	fi
     fi
 
-    local qemu
-    read qemu <<EOF
+    read -r qemu <<EOF
 	$CONFIG_QEMU_MACHINE -nodefaults -m $CONFIG_QEMU_MACHINE_RAM \
 	  $(loader_args) \
 	  $(rootfs_args) \
@@ -317,18 +341,28 @@ run_qemu()
 	  $(gdb_args) \
 	  $CONFIG_QEMU_EXTRA
 EOF
+    # Save resulting command to a script, because I cannot for the life
+    # of me figure out how to embed the JSON snippet for Rocker and run
+    # it here without issues, spent way too much time on it -- Joachim
+    run=$(mktemp -t run.qemu.XXX)
+    echo "#!/bin/sh" > "$run"
+    if [ "$CONFIG_QEMU_KERNEL" ]; then
+	echo "$qemu -append \"$(append_args)\" $*" >> "$run"
+    else
+	echo "$qemu $*" >> "$run"
+    fi
+    chmod +x "$run"
 
     echo "Starting Qemu  ::  Ctrl-a x -- exit | Ctrl-a c -- toggle console/monitor"
     line=$(stty -g)
     stty raw
-
-    if [ "$CONFIG_QEMU_KERNEL" ]; then
-	$qemu -append "$(append_args)" "$@"
-    else
-	$qemu "$@"
-    fi
-
+    $run
     stty "$line"
+    if [ -n "$keep" ]; then
+	echo "Keeping generated qemu.run script: $run"
+    else
+	rm "$run"
+    fi
 }
 
 dtb_args()
@@ -364,7 +398,7 @@ generate_dot()
     hostports="<qtap1> qtap1"
     targetports="<e1> e1"
     edges="host:qtap1 -- target:e1 [kind=mgmt];"
-    for tap in $(seq 2 $(($CONFIG_QEMU_NET_TAP_N - 1))); do
+    for tap in $(seq 2 $((CONFIG_QEMU_NET_TAP_N - 1))); do
 	hostports="$hostports | <qtap$tap> qtap$tap "
 	targetports="$targetports | <e$tap> e$tap "
 	edges="$edges host:qtap$tap -- target:e$tap;"
@@ -404,7 +438,8 @@ menuconfig()
     exec kconfig-mconf Config.in
 }
 
-cd $(dirname $(readlink -f "$0"))
+scriptdir=$(dirname "$(readlink -f "$0")")
+cd "$scriptdir" || (echo "Failed cd to $scriptdir"; exit 1)
 
 while [ "$1" != "" ]; do
     case $1 in
@@ -414,6 +449,9 @@ while [ "$1" != "" ]; do
 	-h)
 	    usage
 	    ;;
+	-k)
+	    keep=true
+	    ;;
 	*)
 	    break
     esac

board/common/rootfs/etc/default/ospfd

@@ -0,0 +1,2 @@
+# --log-level debug
+OSPFD_ARGS="-A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf --log syslog"

board/common/rootfs/etc/default/zebra

@@ -0,0 +1,2 @@
+# --log-level debug
+ZEBRA_ARGS="-A 127.0.0.1 -u frr -g frr --log syslog "

board/common/rootfs/etc/finit.d/available/container@.conf

@@ -1,4 +1,4 @@
-service :%i pid:!/run/k8s-logger-%i.pid <usr/container:%i> \
-	[2345] k8s-logger -cni %i -f local1 /run/containers/%i.fifo -- Logger for container %i
-sysv    :%i pid:!/run/container:%i.pid <pid/k8s-logger:%i> log kill:10 \
+task    name:container-%i :setup \
+	[2345] container -n %i setup -- Setup container %i
+sysv    <!usr/container:%i> :%i pid:!/run/container:%i.pid log:prio:local1,tag:%i kill:10 \
 	[2345] container -n %i -- container %i

board/common/rootfs/etc/finit.d/available/sysklogd.conf

@@ -0,0 +1,4 @@
+# Use <pid/syslogd> as barrier for other system tasks and service that
+# rely on modules, firmware, and device nodes to be ready.
+service if:udevd nowarn env:-/etc/default/sysklogd <run/udevadm:post/success> \
+	[S0123456789] syslogd -F $SYSLOGD_ARGS -- System log daemon

board/common/rootfs/etc/profile.d/alias.sh

@@ -1,2 +1 @@
 alias cli='clish'
-alias cfg='sysrepocfg -f json'

board/common/rootfs/usr/bin/cfg

@@ -0,0 +1,58 @@
+#!/bin/sh
+# User-friendly wrapper for sysrepocfg
+# TODO: add import/export, copy, ...
+
+# Edit YANG binary types using sysrepo, base64, and duct tape.
+edit()
+{
+    xpath=$1
+    if [ -z "$xpath" ]; then
+	echo "Usage: cfg edit \"/full/xpath/to/binary/leaf\""
+	exit 1
+    fi
+
+    if tmp=$(sysrepocfg -G "$xpath"); then
+	file=$(mktemp)
+
+	echo "$tmp" | base64 -d > "$file"
+	if /usr/bin/editor "$file"; then
+	    tmp=$(base64 -w0 < "$file")
+	    sysrepocfg -S "$xpath" -u "$tmp"
+	fi
+
+	rm -f "$file"
+    else
+	echo "Failed to retrieve value for $xpath"
+	exit 1
+    fi
+}
+
+usage()
+{
+    echo "Usage:"
+    echo "    cfg CMD [ARG]"
+    echo
+    echo "Command:"
+    echo "    edit XPATH   Edit YANG binary type"
+    echo "    help         This help text"
+    echo
+    echo "As a backwards compatible fallback, this script forwards"
+    echo "all other commands as options to sysrepocfg."
+    echo
+
+    exit 0
+}
+
+cmd=$1; shift
+case $cmd in
+    edit)
+	edit "$1"
+	;;
+    help)
+	usage
+	;;
+    *)
+	set -- "$cmd" "$@"
+	exec sysrepocfg -f json "$@"
+	;;
+esac

board/common/rootfs/usr/bin/pager

@@ -1 +0,0 @@
-less

board/common/rootfs/usr/bin/pager

@@ -0,0 +1,14 @@
+#!/bin/sh
+# -d ;; suppress error message "the terminal is dumb"
+# -F :: exit if the entire file can be displayed on the first screen
+# -I :: Ignore case, even for patterns
+# -K :: exit immediately when an interrupt character (usually ^C) is typed
+# -R :: Almost raw control charachters, only ANSI color escape sequences and
+#       OSC 8 hyperlink sequences are output.  Allows veritcal scrolling
+# -X :: No termcap initialization and deinitialization set to the terminal.
+#       This is what leaves the contents of the output on screen.
+
+export LESS="-P %f (press h for help or q to quit)"
+export LANG=en_US.UTF-8
+
+less -RIKd -FX "$@"

board/common/rootfs/usr/lib/finit/system/20-hw-wait.conf

@@ -0,0 +1,9 @@
+# Extend finit's default udevadm settle synchronization for situations
+# where device are very slow to probe (see #685)
+run nowarn if:udevd cgroup.init <service/udevd/ready> log \
+	[S] /usr/libexec/infix/hw-wait -- Probing hardware
+
+# Now that everything should be probed, do a final pass over the
+# uevent queue before starting syslogd and everything else
+run nowarn if:udevd cgroup.init :post <service/udevd/ready> log \
+	[S] udevadm settle -t 30 --

board/common/rootfs/usr/lib/tmpfiles.d/containers.conf

@@ -0,0 +1,6 @@
+d  /run/containers/args		0700 - -
+d  /run/containers/files	0700 - -
+d  /var/lib/containers		0700 - -
+d  /var/lib/containers/oci	0700 - -
+d  /run/cni			0755 - -
+L+ /var/lib/cni                 -    - - - /run/cni

board/common/rootfs/usr/lib/tmpfiles.d/frr.conf

@@ -1 +1,2 @@
 d /var/run/frr 0755 frr frr -
+R /var/tmp/frr -    -   -   -

board/common/rootfs/usr/libexec/infix/hw-wait

@@ -0,0 +1,41 @@
+#!/bin/sh
+# (Ab)use the kernel's device link subsystem to detect consumer side
+# devices that may be very slow to probe (looking at you, mv88e6xxx!).
+
+ident=$(basename "$0")
+
+report()
+{
+    if [ -r "/tmp/$ident" ]; then
+	logger -k -p "user.$1" -t "$ident" "Waited for slow devices:"
+	sort "/tmp/$ident" | uniq -c | logger -k -p "user.$1" -t "$ident"
+    fi
+
+    rm -f "/tmp/$ident"
+}
+
+for _ in $(seq 50); do
+    again=
+
+    for dl in /sys/class/devlink/*; do
+    	[ -r "$dl/status" ] || continue
+
+    	status=$(cat "$dl/status")
+	if [ "$status" = "consumer probing" ]; then
+	    basename "$(readlink "$dl/consumer")" >>"/tmp/$ident"
+	    again=yes
+	fi
+
+    done
+
+    if [ -z "$again" ]; then
+	report notice
+	exit 0
+    fi
+
+    sleep .2
+done
+
+logger -k -p user.error -t "$ident" "Timeout waiting for devices to come online"
+report error
+exit 1

board/common/rootfs/usr/libexec/infix/init.d/20-nameif

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

board/common/rootfs/usr/libexec/infix/mnt

@@ -45,11 +45,6 @@ factory_reset()
     find /sys/class/leds/ -type l -exec sh -c 'echo 100 > $0/brightness' {} \;
     logger $opt -p user.crit -t "$nm" "Resetting to factory defaults."
 
-    # Shred all files to prevent restoring contents
-    find /mnt/cfg -type f -exec shred -zu {} \;
-    find /mnt/var -type f -exec shred -zu {} \;
-
-    # Remove any lingering directories and symlinks as well
     rm -rf /mnt/cfg/* /mnt/var/*
 
     logger $opt -p user.crit -t "$nm" "Factory reset complete."

board/common/rootfs/usr/sbin/container

@@ -1,5 +1,18 @@
 #!/bin/sh
-
+# This script can be used to start, stop, create, and delete containers.
+# It is what confd use, with the Finit container@.conf template, to set
+# up, run, and delete containers.
+#
+# NOTE: when creating/deleting containers, remember 'initctl reload' to
+#       activate the changes!  In confd this is already handled.
+#
+DOWNLOADS=/var/lib/containers/oci
+BUILTIN=/lib/oci
+TMPDIR=/var/tmp
+checksum=""
+extracted=
+timeout=30
+dir=""
 all=""
 env=""
 port=""
@@ -10,6 +23,87 @@ log()
     logger -I $PPID -t container -p local1.notice -- "$*"
 }
 
+err()
+{
+    rc=$1; shift
+    logger -I $PPID -t container -p local1.err -- "Error: $*"
+
+    if [ -n "$extracted" ]; then
+	if [ -d "$TMPDIR/$dir" ]; then
+	    log "Cleaning up extracted $dir"
+	    rm -rf "$dir"
+	fi
+    fi
+
+    [ "$rc" -eq 0 ] || exit "$rc"
+}
+
+check()
+{
+    file=$1
+
+    if [ -z "$checksum" ]; then
+	log "no checksum to verify $file against, continuing."
+	return 0
+    fi
+
+    if echo "${checksum}  ${file}" | "$cmdsum" -c -s; then
+        log "$file checksum verified OK."
+	return 0
+    fi
+
+    got=$("$cmdsum" "${file}" | awk '{print $1}')
+    log "$file checksum mismatch, got $got, expected $checksum, removing file."
+    rm -f "$file"
+
+    return 1
+}
+
+# Fetch an OCI image over ftp/http/https.  Use wget for FTP, which curl
+# empirically does not work well with.  Log progress+ & error to syslog.
+fetch()
+{
+    url=$1
+    file=$(basename "$url")
+    dst="$DOWNLOADS/$file"
+
+    cd "$DOWNLOADS" || return
+    if [ -e "$file" ]; then
+	log "$file already available."
+	if check "$file"; then
+	    echo "$dst"
+	    return 0
+	fi
+    fi
+
+    log "Fetching $url"
+
+    if echo "$url" | grep -qE "^ftp://"; then
+        cmd="wget -q $url"
+    elif echo "$url" | grep -qE "^https?://"; then
+        cmd="curl $creds -sSL --fail -o \"$file\" $url"
+    else
+        log "Unsupported URL scheme: $url"
+        return 1
+    fi
+
+    if out=$(eval "$cmd" 2>&1); then
+	log "$file downloaded successfully."
+	if check "$file"; then
+	    echo "$dst"
+	    return 0
+	fi
+    fi
+
+    # log error message from backend
+    while IFS= read -r line; do
+	log "$line"
+    done <<EOF
+$out
+EOF
+    return 1
+}
+
 # Unpacks a given oci-archive.tar[.gz] in the current directory.  Sanity
 # checks, at least one index.json in the top-level dir of the archive.
 # If there are more index files, this function does not handle them.
@@ -26,45 +120,74 @@ unpack_archive()
 	oci-archive:*)		# Packed OCI image, .tar or .tar.gz format
 	    file=${image#oci-archive:}
 	    ;;
+	ftp://* | http://* | https://*)
+            if ! file=$(fetch "$image"); then
+		return 1
+	    fi
+            ;;
 	*)			# docker://*, docker-archive:*, or URL
-	    echo "$image"
+	    if podman image exists "$image"; then
+		echo "$image"
+		return 0
+	    fi
+	    # XXX: use --retry=0 with Podman 5.0 or later.
+	    if ! id=$(podman pull --quiet "$image"); then
+		log "Failed pulling $image"
+		return 1
+	    fi
+	    # Echo image name to caller
+	    podman images --filter id="$id" --format "{{.Repository}}:{{.Tag}}"
 	    return 0
 	    ;;
     esac
 
     if [ ! -e "$file" ]; then
-	if [ -e "/var/lib/containers/oci/$file" ]; then
-	    file="/var/lib/containers/oci/$file"
-	elif [ -e "/lib/oci/$file" ]; then
-	    file="/lib/oci/$file"
+	if [ -e "$DOWNLOADS/$file" ]; then
+	    file="$DOWNLOADS/$file"
+	elif [ -e "$BUILTIN/$file" ]; then
+	    file="$BUILTIN/$file"
 	else
-	    log "Error: cannot find OCI archive $file in search path."
-	    exit 1
+	    err 1 "cannot find OCI archive $file in search path."
 	fi
     fi
 
     if [ -d "$file" ]; then
 	index=$(find "$file" -name index.json)
 	if [ -z "$index" ]; then
-	    log "Error: cannot find index.json in OCI image $file"
-	    exit 1
+	    err 1 "cannot find index.json in OCI image $file"
 	fi
     else
+	cd "$TMPDIR" || err 0 "failed cd $TMPDIR, wiill use $(pwd) for OCI archive extraction."
+
 	index=$(tar tf "$file" |grep index.json)
 	if [ -z "$index" ]; then
-	    log "Error: invalid OCI archive, cannot find index.json in $file"
-	    exit 1
+	    err 1 "invalid OCI archive, cannot find index.json in $file"
 	fi
 
 	[ -n "$quiet" ] || log "Extracting OCI archive $file ..."
-        tar xf "$file" || (log "Error: failed unpacking $file in $(pwd)"; exit 1)
-	remove=true
+        tar xf "$file"  || err 1 "failed unpacking $file in $(pwd)"
+	extracted=true
     fi
 
     dir=$(dirname "$index")
+    if echo "$dir" | grep -q ":"; then
+        if [ -z "$name" ]; then
+            name="$dir"
+        fi
+        sanitized_dir=$(echo "$dir" | cut -d':' -f1)
+        mv "$dir" "$sanitized_dir" || err 1 "failed renaming $dir to $sanitized_dir"
+        dir="$sanitized_dir"
+    fi
+
     [ -n "$quiet" ] || log "Loading OCI image $dir ..."
     podman load -qi "$dir"        >/dev/null
 
+    # Clean up after ourselves
+    if [ -n "$extracted" ]; then
+	log "Cleaning up extracted $dir"
+	rm -rf "$dir"
+    fi
+
     # Rename image from podman default $dir:latest
     if [ -n "$name" ]; then
 	podman tag "$dir" "$name" >/dev/null
@@ -73,10 +196,6 @@ unpack_archive()
 	name=$dir
     fi
 
-    if [ "$remove" = "true" ]; then
-	rm -rf "$file"
-    fi
-
     echo "$name"
 }
 
@@ -102,15 +221,18 @@ create()
 
     # Unpack and load docker-archive/oci/oci-archive, returning image
     # name, or return docker:// URL for download.
-    image=$(unpack_archive "$image")
-
-    if [ -z "$logging" ]; then
-	logging="--log-driver k8s-file --log-opt path=/run/containers/$name.fifo"
+    if ! image=$(unpack_archive "$image"); then
+	exit 1
     fi
 
-    args="$args --replace --quiet --cgroup-parent=containers $caps"
+    if [ -z "$logging" ]; then
+	logging="--log-driver none"
+    fi
+
+    # When we get here we've already fetched, or pulled, the image
+    args="$args --read-only --replace --quiet --cgroup-parent=containers $caps"
     args="$args --restart=$restart --systemd=false --tz=local $privileged"
-    args="$args $ro $vol $mount $hostname $entrypoint $env $port $logging"
+    args="$args $vol $mount $hostname $entrypoint $env $port $logging"
     pidfn=/run/container:${name}.pid
 
     [ -n "$quiet" ] || log "---------------------------------------"
@@ -134,16 +256,17 @@ create()
     fi
 
     # shellcheck disable=SC2048
-    log "Calling podman create --name $name --conmon-pidfile=$pidfn $args $image $*"
+    log "podman create --name $name --conmon-pidfile=$pidfn $args $image $*"
     if podman create --name "$name" --conmon-pidfile="$pidfn" $args "$image" $*; then
-	[ -n "$quiet" ] || log "Successfully created container $name from $image"
-	rm -f "/run/containers/env/${name}.env"
+	[ -n "$quiet"  ] || log "Successfully created container $name from $image"
 	[ -n "$manual" ] || start "$name"
+
+	# Should already be enabled by confd (this is for manual use)
+	initctl -bnq enable "container@${name}.conf"
 	exit 0
     fi
 
-    log "Error: failed creating container $name, please check the configuration."
-    exit 1
+    err 1 "failed creating container $name, please check the configuration."
 }
 
 delete()
@@ -157,18 +280,27 @@ delete()
 	exit 1
     fi
 
+    # Should already be stopped, but if not ...
+    container stop "$name"
+
+    while running "$name"; do
+	_=$((timeout -= 1))
+	if [ $timeout -le 0 ]; then
+	    err 1 "timed out waiting for container $1 to stop before deleting it."
+	fi
+	sleep 1
+    done
+
     podman rm -vif "$name" >/dev/null 2>&1
     [ -n "$quiet" ] || log "Container $name has been removed."
 }
 
 waitfor()
 {
-    timeout=$2
     while [ ! -f "$1" ]; do
 	_=$((timeout -= 1))
 	if [ $timeout -le 0 ]; then
-	    log "Timeout waiting for $1, aborting!"
-	    exit 1
+	    err 1 "timed out waiting for $1, aborting!"
 	fi
 	sleep 1;
     done
@@ -236,6 +368,12 @@ netrestart()
     done
 }
 
+cleanup()
+{
+    log "Received signal, exiting."
+    exit 1
+}
+
 usage()
 {
 	cat <<EOF
@@ -248,6 +386,7 @@ options:
       --dns-search LIST    Set host lookup search list when creating container
       --cap-add CAP        Add capability to unprivileged container
       --cap-drop CAP       Drop capability, for privileged containter
+      --checksum TYPE:SUM  Use md5/sha256/sha512 to verify ftp/http/https archives
   -c, --creds USR[:PWD]    Credentials to pass to curl -u for remote ops
   -d, --detach             Detach a container started with 'run IMG [CMD]'
   -e, --env FILE           Environment variables when creating container
@@ -267,14 +406,15 @@ options:
                            Syntax: [[ip:][hostPort]:]containerPort[/protocol]
   -q, --quiet              Quiet operation, called from confd
   -r, --restart POLICY     One of "no", "always", or "on-failure:NUM"
-      --read-only          Do not create a writable layer
   -s, --simple             Show output in simplified format
+  -t, --timeout SEC        Set timeout for delete/restart commands, default: 20
   -v, --volume NAME:PATH   Create named volume mounted inside container on PATH
 
 commands:
   create   NAME IMAGE NET  Create container NAME using IMAGE with networks NET
   delete  [network] NAME   Remove container NAME or network NAME from all containers
   exec     NAME CMD        Run a command inside a container
+  flush                    Clean up lingering containers and associated anonymous volumes
   find    [ifname PID]     Find PID of container where '--net IFNAME' currently lives
                            or, find the name of our IFNAME inside the container @PID
   help                     Show this help text
@@ -285,6 +425,7 @@ commands:
   restart [network] NAME   Restart a (crashed) container or container(s) using network
   run      NAME [CMD]      Run a container interactively, with an optional command
   save     IMAGE FILE      Save a container image to an OCI tarball FILE[.tar.gz]
+  setup    NAME            Create and set up container as a Finit task
   shell                    Start a shell inside a container
   show    [image | volume] Show containers, images, or volumes
   stat                     Show continuous stats about containers (Ctrl-C aborts)
@@ -307,6 +448,25 @@ while [ "$1" != "" ]; do
 	    shift
 	    caps="$caps --cap-drop=$1"
 	    ;;
+	--checksum)
+	    shift
+	    type="${1%%:*}"
+	    checksum="${1#*:}"
+	    case "$type" in
+		md5)
+		    cmdsum=md5sum
+		    ;;
+		sha256)
+		    cmdsum=sha256sum
+		    ;;
+		sha512)
+		    cmdsum=sha512sum
+		    ;;
+		*)
+		    err 1 "Unsupported checksum type: $type"
+		    ;;
+	    esac
+	    ;;
 	-c | --creds)
 	    shift
 	    creds="-u $1"
@@ -351,7 +511,6 @@ while [ "$1" != "" ]; do
 	--log-path)
 	    shift
 	    logging="$logging --log-opt path=$1"
-	    log_path="$1"
 	    ;;
 	-m | --mount)
 	    shift
@@ -386,12 +545,13 @@ while [ "$1" != "" ]; do
 	    shift
 	    restart=$1
 	    ;;
-	--read-only)
-	    ro="--read-only=true"
-	    ;;
 	-s | --simple)
 	    simple=true
 	    ;;
+	-t | --timeout)
+	    shift
+	    timeout=$1
+	    ;;
 	-v | --volume)
 	    shift
 	    vol="$vol -v $1"
@@ -408,6 +568,8 @@ if [ -n "$cmd" ]; then
     shift
 fi
 
+trap cleanup INT TERM
+
 case $cmd in
     # Does not work atm., cannot attach to TTY because
     # we monitor 'podman start -ai foo' with Finit.
@@ -430,6 +592,10 @@ case $cmd in
     exec)
 	podman exec -it "$@"
 	;;
+    flush)
+	echo "Cleaning up any lingering containers";
+	podman rm -av
+	;;
     find)
 	cmd=$1
 	pid=$2
@@ -455,25 +621,12 @@ case $cmd in
 	usage
 	;;
     load)
-	url=$1
-	name=$2
 	# shellcheck disable=SC2086
-	if echo "$url" | grep -q "://"; then
-	    file=$(basename "$url")
-            curl -k $creds -Lo "$file" "$url"
-	else
-            file="$url"
-	fi
-
-	# shellcheck disable=SC2086
-	name=$(unpack_archive "$file" $name)
+	name=$(unpack_archive "$1" $2)
+	[ -n "$name" ] || exit 1
 
 	# Show resulting image(s) matching $name
-	if [ -n "$name" ]; then
-	    podman images -n "$name"
-	else
-	    exit 1
-	fi
+	podman images -n "$name"
 	;;
     locate)			# Find where the host's ifname lives
 	if [ -z "$network" ]; then
@@ -500,7 +653,7 @@ case $cmd in
 		podman images $all --format "{{.Repository}}:{{.Tag}}"
 		;;
 	    oci)
-		find /lib/oci /var/lib/containers/oci -type f 2>/dev/null
+		find $BUILTIN $DOWNLOADS -type f 2>/dev/null
 		;;
 	    *)		
 		podman ps $all --format "{{.Names}}"
@@ -542,6 +695,20 @@ case $cmd in
 	    gzip "$file"
 	fi
 	;;
+    setup)
+	[ -n "$name" ] || err 1 "setup: missing container name."
+	script=/run/containers/${name}.sh
+	[ -x "$script" ] || err 1 "setup: $script does not exist or is not executable."
+	while ! "$script"; do
+	    # Wait for address/route changes, or retry every 60 secods
+	    # shellcheck disable=2162,3045
+	    ip monitor address route | while read -t 60 _; do break; done
+
+	    # On IP address/route changes, wait a few seconds more to ensure
+	    # the system has ample time to react and set things up for us.
+	    sleep 2
+	done
+	;;
     shell)
 	podman exec -it "$1" sh -l
 	;;
@@ -596,12 +763,10 @@ case $cmd in
 	    else
 		name=$1
 		stop "$name"
-		timeout=20
 		while running "$name"; do
 		    _=$((timeout -= 1))
 		    if [ $timeout -le 0 ]; then
-			log "Timeout waiting for container $1 to stop before restarting it."
-			exit 1
+			err 1 "timed out waiting for container $1 to stop before restarting it."
 		    fi
 		    sleep 1
 		done
@@ -627,7 +792,7 @@ case $cmd in
 	;;
     upgrade)
 	# Start script used to initially create container
-	script=/var/lib/containers/active/S01-${1}.sh
+	script=/run/containers/${1}.sh
 
 	# Find container image
 	img=$(podman inspect "$1" | jq -r .[].ImageName)
@@ -658,7 +823,7 @@ case $cmd in
 	[ -n "$cmd" ] && shift
 	case $cmd in
 	    prune)
-		podman volume $force prune
+		podman volume prune $force
 		;;
 	    *)
 		false

board/common/rootfs/usr/share/udhcpc/default.script

@@ -50,7 +50,7 @@ set_dhcp_routes()
 	# format: dest1/mask gw1 ... destn/mask gwn
 	set -- $staticroutes
 	while [ -n "$1" -a -n "$2" ]; do
-	    log "adding route $1 via $2 dev $interface proto dhcp"
+	    log "adding route $1 via $2 metric $metric tag 100"
 	    echo "ip route $1 $2 $metric tag 100" >> "$NEXT"
 	    shift 2
 	done
@@ -115,7 +115,7 @@ case "$ACTION" in
 	    /usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface
 	fi
 
-	if /bin/ip addr add dev $interface $ip/$subnet $BROADCAST proto 5; then
+	if /bin/ip addr add dev $interface $ip/$subnet $BROADCAST proto dhcp; then
 	    echo "$ip" > "$IP_CACHE"
 	fi
 	if [ -n "$ipv6" ] ; then

board/x86_64/linux_defconfig

@@ -33,6 +33,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_PROFILING=y
 CONFIG_SMP=y
 CONFIG_EFI=y
+CONFIG_KPROBES=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -161,12 +162,14 @@ CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=y
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_PKTGEN=y
 # CONFIG_WIRELESS is not set
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
 CONFIG_LWTUNNEL=y
 CONFIG_PCI=y
+CONFIG_PCI_MSI=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
@@ -208,6 +211,7 @@ CONFIG_NET_VRF=y
 CONFIG_E1000=y
 CONFIG_NE2K_PCI=y
 CONFIG_8139CP=y
+CONFIG_ROCKER=y
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_SERIAL_8250=y
@@ -264,5 +268,5 @@ CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_TIMEOUT=20
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
-# CONFIG_FTRACE is not set
+CONFIG_FUNCTION_TRACER=y
 CONFIG_UNWINDER_FRAME_POINTER=y

configs/aarch64_defconfig

@@ -134,7 +134,6 @@ BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_CURIOS_HTTPD=y
 BR2_PACKAGE_CURIOS_NFTABLES=y
-BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
 BR2_PACKAGE_FACTORY=y
@@ -147,7 +146,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc"
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
-BR2_PACKAGE_K8S_LOGGER=y
 BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LANDING=y

configs/r2s_defconfig

@@ -175,7 +175,6 @@ INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_CONFD=y
-BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
 BR2_PACKAGE_FACTORY=y
@@ -188,7 +187,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc"
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
-BR2_PACKAGE_K8S_LOGGER=y
 BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LANDING=y

configs/riscv64_defconfig

@@ -165,7 +165,6 @@ INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_CONFD=y
 # BR2_PACKAGE_CONFD_TEST_MODE is not set
-BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
 BR2_PACKAGE_FACTORY=y
@@ -178,7 +177,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc"
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
-BR2_PACKAGE_K8S_LOGGER=y
 BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LANDING=y

configs/x86_64_defconfig

@@ -138,7 +138,6 @@ BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_CURIOS_HTTPD=y
 BR2_PACKAGE_CURIOS_NFTABLES=y
-BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
 BR2_PACKAGE_FACTORY=y
@@ -151,7 +150,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc"
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IITO=y
-BR2_PACKAGE_K8S_LOGGER=y
 BR2_PACKAGE_KEYACK=y
 BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LANDING=y

doc/ChangeLog.md

@@ -3,6 +3,110 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v24.11.2][] - 2025-03-19
+-------------------------
+
+### Fixes
+
+- Fix TCAM memory corruption in `mvpp2` Ethernet controller
+
+
+[v24.11.1][] - 2024-11-29
+-------------------------
+
+### Changes
+
+ - Upgrade Frr to 9.1.2, fixes an OSPF issue where *Zebra* lost netlink
+   messages and drifted out of sync with the kernel's view of addresses
+   and interfaces available in the system
+ - Allow setting IP address directly on VLAN filtering bridges.  This
+   only works when the bridge is an untagged member of a (single) VLAN.
+ - cli: usability -- showing log files now automatically jump to the end
+   of the file, where the latest events are
+ - cli: usability -- showing container status, or other status that
+   overflows the terminal horizontally, now wrap the lines and exit the
+   pager immediately if the contents fit on the first screen
+ - The default log level of the mDNS responder, `avahi-daemon`, has been
+   adjusted to make it less verbose.  Now only `LOG_NOTICE` and higher
+   severity is logged -- making it very quiet
+
+### Fixes
+
+ - Fix #685: DSA conduit interface not always detected.  Previous
+   attempt at a fix (v24.10.2) mitigated the issue, but did not
+   completely solve it.
+ - Fix #835: redesign how the system creates/deletes containers from the
+   `running-config`.  Prior to this change, all removal and creation was
+   handled by a separate queue that ran asynchronously from the `confd`
+   process.  This could lead to situations where new configurations are
+   applied before the queue had been fully processed.  After this change
+   containers are deleted synchronously and new containers are created
+   in the same flow as during normal runtime operation (start/upgrade)
+ - Fix start of containers with `manual=True` option should now work
+   again, regression in v24.11.0
+ - Fix loss of writable volumes when temporarily disabling a container
+   in the configuration, now the container remains dormant with all its
+   volumes still available
+ - Fix presentation bug in CLI `show interfaces` where all line-drawing
+   characters showed up as hexadecimal values.  Regression in v24.11.0
+ - Fix missing log messages from Frr Zebra daemon
+ - Stop the zeroconf (IPv4LL) agent, `avahi-autoipd`, when removing an
+   interface, e.g., `br0`
+ - Creating more than one container trigger restarts of previously set
+   up containers.  Which in some cases may cause these earlier ones to
+   end up in an inconsistent state
+ - Prevent traffic assigned to locally terminated VLANs from being
+   forwarded, when the underlying ports are simultaneously attached to
+   a VLAN filtering bridge.
+
+
+[v24.11.0][] - 2024-11-20
+-------------------------
+
+> [!CAUTION]
+> This release contains breaking changes for container users!  As of
+> v24.11.0, all persistent[^1] containers always run in `read-only` mode
+> and the setting itself is deprecated (kept only for compatibility
+> reasons).  The main reason for this change is to better serve users
+> with embedded container images in their builds of Infix.  I.e., they
+> can now upgrade the OCI image in their build and rely on the container
+> being automatically upgraded when Infix is upgraded, issue #823.  For
+> other users, the benefit is that *all* container configuration changes
+> take when activated, issue #822, without having to perform any tricks.
+
+### Changes
+
+ - Add validation of interface name lengths, (1..15), Linux limit
+ - Add support for ftp/http/https URI:s in container image, with a new
+   `checksum` setting for MD5/SHA256/SHA512 verification, issue #801
+ - Add a retry timer to the background container create service.  This
+   will ensure failing `docker pull` operations from remote images are
+   retrying after 60 seconds, or quicker
+ - CLI base component, `klish`, has been updated with better support for
+   raw terminal mode and alternate quotes (' in addition to ")
+ - Log silenced from container activation messages, only the very bare
+   necessities are now logged, e.g., `podman create` command + status
+ - Factory reset no longer calls `shred` to "securely erase" any files
+   from writable data partitions.  This will speed up the next boot
+   considerably
+
+### Fixes
+
+ - Fix #659: paged output in CLI accessed via console port sometimes
+   causes lost lines, e.g. missing interfaces.  With updated `klish`
+   and the terminal in raw mode, the pager (less) can now control both
+   the horizontal and vertical
+ - Fix #822: adding, or changing, an environment variable to a running
+   container does not take without the `container upgrade NAME` trick
+ - Fix #823: with an OCI image embedded in the Infix image, an existing
+   container in the configuration is not upgraded to the new OCI image
+   with the Infix upgrade.
+ - Frr leaves log files in `/var/tmp/frr` on unclean shutdowns.  This
+   has now been fixed with a "tmpfiles" cleanup of that path at boot
+
+[^1]: I.e., set up in the configuration, as opposed to temporary ones
+    started with `container run` from the CLI admin-exec context.
+
 
 [v24.10.2][] - 2024-11-08
 -------------------------
@@ -36,6 +140,7 @@ All notable changes to the project are documented in this file.
 - Styx: override iitod (LED daemon) with a product specific LED script
 
 ### Fixes
+
 - Fix #685: DSA conduit interface not always detected, randomly causing
   major issues configuring systems with multiple switch cores
 - Fix #778: reactivate OpenSSL backend for libssh/libssh2 for NanoPI R2S.
@@ -52,11 +157,13 @@ All notable changes to the project are documented in this file.
 -------------------------
 
 ### Changes
+
  - Add support for interface description, sometimes referred to as
    "ifAlias".  Saved as an Linux interface alias (not `altname`), e.g.,
    `/sys/class/interfaces/veth0a/ifalias`, includes operational support
 
 ### Fixes
+
  - Fix #735: `copy` and `erase` commands missing from CLI, regression
    in Infix v24.10.0 defconfigs, now added as dep. in klish package
 
@@ -71,7 +178,9 @@ Also, heads-up to all downstream users of Infix.  YANG models have been
 renamed to ease maintenance, more info below.
 
 ### Changes
+
 - Software control of port LEDs on the Styx platform has been disabled.
+
   Default driver behavior, green link and green traffic blink, is kept
   as-is, which should mitigate issues reported in #670
 - Correcting documentation on QoS. For packets containing both a VLAN
@@ -107,6 +216,7 @@ renamed to ease maintenance, more info below.
   see <https://kernelkit.org/posts/firewall-container/>
 
 ### Fixes
+
 - Fix #499: add an NACM rule to factory-config, which by default deny
   everyone to read user password hash(es)
 - Fix #663: internal Ethernet interfaces shown in CLI tab completion
@@ -155,6 +265,7 @@ also been added to facilitate site specific adaptations.  Please see the
 documentation for details.
 
 ### Known Issues
+
 - The CLI command `show interfaces` may for some terminal resolutions
   not display all interfaces (on systems with >20 interfaces).  This
   problem is limited to the console port and only occurs for smaller
@@ -163,6 +274,7 @@ documentation for details.
   using the CLI from an SSH session, is not affected.  Issue #659
 
 ### Changes
+
 - Upgrade Buildroot to 2024.02.6 (LTS)
 - Upgrade Linux kernel to 6.6.52 (LTS)
 - Upgrade libyang to 3.4.2
@@ -182,6 +294,7 @@ documentation for details.
   by `mctl` reporting no multicast filtering enabled on bridge
 
 ### Fixes
+
 - Fix #357: EUI-64 based IPv6 autoconf address on bridges seem to be
   randomized.  Problem caused by kernel setting a random MAC before any
   bridge port is added.  Fixed by using the device's base MAC address on
@@ -244,6 +357,7 @@ Finally, the following consumer boards are now fully supported:
  - StarFive VisionFive2 (RISC-V)
 
 ### Changes
+
 - Upgrade Buildroot to 2024.02.5 (LTS)
 - Upgrade Linux kernel to 6.6.46 (LTS)
 - Issue #158: enhance security of factory reset.  All file content
@@ -295,6 +409,7 @@ Finally, the following consumer boards are now fully supported:
   log messages.  See `/var/log/debug` for *all* log messages
 
 ### Fixes
+
 - Fix #274: add missing link/traffic LEDs on NanoPi R2S LAN port
 - Fix #489: ensure all patches are versioned, including Linux kernel
 - Fix #531: creating a new VLAN interface named `vlanN` should not set
@@ -324,6 +439,7 @@ Finally, the following consumer boards are now fully supported:
 > upgrade, but before reboot, a factory reset is required!
 
 ### Changes
+
 - Upgrade Buildroot to 2024.02.3 (LTS)
 - Upgrade Linux kernel to 6.6.34 (LTS)
 - Upgrade bundled curiOS httpd container to v24.05.0
@@ -390,6 +506,7 @@ Finally, the following consumer boards are now fully supported:
 [yescrypt]: https://en.wikipedia.org/wiki/Yescrypt
 
 ### Fixes
+
 - Fix #424: regression, root user can log in without password
 - Fix build regressions in `cn9130_crb_boot_defconfig` caused by upgrade
   to Buildroot v2024.02 and recent multi-key support in RAUC and U-Boot
@@ -421,11 +538,13 @@ Finally, the following consumer boards are now fully supported:
 -------------------------
 
 ### Changes
+
 - Add small delay in U-Boot to allow stopping boot on reference boards
 - Document how to provision the bootloader and Infix on a blank board
 - Use initial hostname from `/etc/os-release` as configuration fallback
 
 ### Fixes
+
 - Fix build regressions in `cn9130_crb_boot_defconfig` caused by upgrade
   to Buildroot v2024.02 and recent multi-key support in RAUC and U-Boot
 - Fix provisioning script after changes to make GRUB loading more robust
@@ -440,6 +559,7 @@ Finally, the following consumer boards are now fully supported:
 -------------------------
 
 ### Changes
+
 - Default web landing page refactored into a Buildroot package to make
   it possible to overload from customer repos.
 - Enable DCB support in aarch64 kernel (for EtherType prio override)
@@ -450,6 +570,7 @@ Finally, the following consumer boards are now fully supported:
 - Issue #374: add timestamps to dagger .log files
 
 ### Fixes
+
 - Add missing LICENSE hash for factory reset tool
 - Fix #424: regression, root user can log in without password
 
@@ -471,6 +592,7 @@ idea is to generate supported features from the models and include in
 future releases.
 
 ### Changes
+
 - Bump the base Buildroot version to v2024.02 LTS
 - Bump the base Linux kernel version to 6.6 LTS
 - Drop Classic variant to reduce overhead, simplify build & release
@@ -551,6 +673,7 @@ future releases.
   named 'default'
 
 ### Fixes
+
 - confd: Fix memory leak when operating on candidate configuration
 - probe: Fix crash on systems without USB
 - Reduced syslog errors for accesses no non-existing xpaths
@@ -1293,7 +1416,10 @@ Supported YANG models in addition to those used by sysrepo and netopeer:
  - N/A
 
 [buildroot]:  https://buildroot.org/
-[UNRELEASED]: https://github.com/kernelkit/infix/compare/v24.10.1...HEAD
+[UNRELEASED]: https://github.com/kernelkit/infix/compare/v24.11.0...HEAD
+[v24.11.2]:   https://github.com/kernelkit/infix/compare/v24.11.1...v24.11.2
+[v24.11.1]:   https://github.com/kernelkit/infix/compare/v24.11.0...v24.11.1
+[v24.11.0]:   https://github.com/kernelkit/infix/compare/v24.10.0...v24.11.0
 [v24.10.2]:   https://github.com/kernelkit/infix/compare/v24.10.1...v24.10.2
 [v24.10.1]:   https://github.com/kernelkit/infix/compare/v24.10.0...v24.10.1
 [v24.10.0]:   https://github.com/kernelkit/infix/compare/v24.09.0...v24.10.0

doc/container.md

@@ -20,6 +20,9 @@ Containers in Infix
   * [Application Container: ntpd](#application-container-ntpd)
 * [Advanced](#advanced)
   * [Running Host Commands From Container](#running-host-commands-from-container)
+* [Container Requirements](#container-requirements)
+  * [Advanced Users](#advanced-users)
+
 
 Introduction
 ------------
@@ -36,10 +39,11 @@ All network specific settings are done using the IETF interfaces YANG
 model, with augments for containers to ensure smooth integration with
 container networking in podman.
 
-> **Note:** even though the `podman` command can be used directly from a
-> shell prompt, we strongly recommend using the CLI commands instead.
-> They employ the services of a wrapper `container` script which handles
-> the integration of containers in the system.
+> [!IMPORTANT]
+> Even though the `podman` command can be used directly from a shell
+> prompt, we strongly recommend using the CLI commands instead.  They
+> employ the services of a wrapper `container` script which handles the
+> integration of containers in the system.
 
 
 Caution
@@ -83,26 +87,26 @@ The former is useful mostly for testing, or running single commands in
 an image.  It is a wrapper for `podman run -it --rm ...`, while the
 latter is a wrapper and adaptation of `podman create ...`.
 
-The second create a container with a semi-persistent writable layer that
-survives container restarts and host system restarts.  However, if you
-change the container configuration or upgrade the image (see below), the
-container will be recreated and the writable layer is lost.  This is why
-it is recommended to set up a named volume for directories, or use file
-[Content Mounts](#content-mounts), in your container if you want truly
-persistent content.
+The second creates a read-only container that is automatically started
+at every boot.  When non-volatile storage is needed, data stored in a
+volume is persisted until explicitly removed from the configuration,
+i.e., across host and container reboots and upgrades.
 
-In fact, in many cases the best way is to create a `read-only` container
-and use file mounts and volumes only for the critical parts.  Podman
-ensures (using tmpfs) `read-only` containers still have writable
-directories for certain critical file system paths: `/dev`, `/dev/shm`,
-`/run`, `/tmp`, and `/var/tmp`.  Meaning, what you most often need is
-writable volumes for `/var/lib` and `/etc`, or only file mounts for a
-few files in `/etc`.  The actual needs depend on the container image and
-application to run.
+Another option is [Content Mounts](#content-mounts), where the content
+of a file mounted into the container is kept along with the container
+configuration in the device's `startup-config`.
 
-> **Note:** when running containers from public registries, double-check
-> that they support the CPU architecture of your host system.  Remember,
-> unlike virtualization, containers reuse the host's CPU and kernel.
+Podman ensures (using tmpfs) all containers have writable directories
+for certain critical file system paths: `/dev`, `/dev/shm`, `/run`,
+`/tmp`, and `/var/tmp`.  Meaning, what you most often need is writable
+volumes for `/var/lib` and `/etc`, or only file mounts for a few files
+in `/etc`.  The [actual requirements](#container-requirements) depend on
+your container image and application to run.
+
+> [!IMPORTANT]
+> When running containers from public registries, double-check that they
+> support the CPU architecture of your host system.  Remember, unlike
+> virtualization, containers reuse the host's CPU and kernel.
 
 
 <img align="right" src="img/docker-hello-world.svg" alt="Hello World" width=360>
@@ -168,13 +172,20 @@ The CLI help shows:
         oci-archive:/lib/oci/archive -- Use archive:latest from OCI archive
                                         May be in .tar or .tar.gz format
 
+        Additionally, the following URIs are also supported for setups
+        that do not use a HUB or similar.  Recommend using 'checksum'!
+
+        ftp://addr/path/to/archive   -- Downloaded using wget
+        http://addr/path/to/archive  -- Downloaded using curl
+        https://addr/path/to/archive -- Downloaded using curl
+
         Note: if a remote repository cannot be reached, the creation of the
               container will be put on a queue that retries pull every time
               there is a route change in the host's system.
 
-> **Note::** the built-in help system in the CLI is generated from the
-> YANG model, so the same information is also available for remote
-> NETCONF users.
+> [!TIP]
+> The built-in help system in the CLI is generated from the YANG model,
+> so the same information is also available for remote NETCONF users.
 
 The two most common variants are `docker://` and `oci-archive:/`.
 
@@ -217,21 +228,46 @@ mind.
     -rw-r--r--    1 root     root       7261785 Mar 27 14:22 curios-oci-amd64.tar.gz
     drwx------    6 frr      frr           4096 Mar 27 11:57 frr/
 
-Importing the image into podman can be done either from the CLI
+Importing the image into Podman can be done either from the CLI
 admin-exec context ...
 
     admin@example:/var/tmp$ cli
     admin@example:/> container load /var/tmp/curios-oci-amd64.tar.gz name curios:edge
 
-> The `name curios:edge` is the tag you give the imported
-> (raw) archive which you can then reference in your container image
-> configuration: `set image curios:edge`.
+> [!TIP]
+> The `name curios:edge` is the tag you give the imported (raw) archive
+> which you can then reference in your container image configuration:
+> `set image curios:edge`.
 
 ... or by giving the container configuration the full path to the OCI
 archive, which helps greatly with container upgrades (see below):
 
     admin@example:/config/container/system/> set image oci-archive:/var/tmp/curios-oci-amd64.tar.gz
 
+**Checksum Example:**
+
+    admin@example:/> configure
+    admin@example:/config/> edit container sys
+    admin@example:/config/container/sys/> set hostname sys
+    admin@example:/config/container/sys/> set image ftp://192.168.122.1/curios-oci-amd64-v24.05.0.tar.gz
+    admin@example:/config/container/sys/> set checksum
+        md5 sha256 sha512
+    admin@example:/config/container/sys/> set checksum sha256 4f01077036527498ed910f1a3e80645ae3eff629d10043cf80ebc6850c99c629
+    admin@example:/config/container/sys/> leave
+    admin@example:/> copy running-config startup-config
+    admin@example:/> show container
+    CONTAINER ID  IMAGE                                             COMMAND               CREATED         STATUS        PORTS       NAMES
+    b02e945c43c9  localhost/curios-oci-amd64-v24.05.0:latest                              5 seconds ago   Up 5 seconds              sys
+
+    admin@example:/> show log
+    ...
+    Nov 20 07:24:56 infix container[5040]: Fetching ftp://192.168.122.1/curios-oci-amd64-v24.05.0.tar.gz
+    Nov 20 07:24:56 infix container[5040]: curios-oci-amd64-v24.05.0.tar.gz downloaded successfully.
+    Nov 20 07:24:56 infix container[5040]: curios-oci-amd64-v24.05.0.tar.gz checksum verified OK.
+    Nov 20 07:24:57 infix container[5040]: Cleaning up extracted curios-oci-amd64-v24.05.0
+    Nov 20 07:24:57 infix container[5040]: podman create --name sys --conmon-pidfile=/run/container:sys.pid --read-only --replace --quiet --cgroup-parent=containers  --restart=always --systemd=false --tz=local --hostname sys --log-driver k8s-file --log-opt path=/run/containers/sys.fifo --network=none curios-oci-amd64-v24.05.0
+    Nov 20 07:24:57 infix container[3556]: b02e945c43c9bce2c4be88e31d6f63cfdb1a3c8bdd02179376eb059a49ae05e4
+
 
 Upgrading a Container Image
 ---------------------------
@@ -240,21 +276,24 @@ Upgrading a Container Image
 The applications in your container are an active part of the system as a
 whole, so make it a routine to keep your container images up-to-date!
 
-> **Note:** the default writable layer is lost when upgrading the image.
-> Use named volumes for content that you want to persist across upgrades.
+Containers are created at first setup and at every boot.  If the image
+exists in the file system it is reused -- i.e., an image pulled from a
+remote registry is not fetched again.
 
-All container configurations are locked to the image hash at the time of
-first download, not just ones that use an `:edge` or `:latest` tag.  An
-upgrade of containers using versioned images is more obvious -- update
-the configuration to use the new `image:tag` -- the latter is a bit
-trickier.  Either remove the configuration and recreate it (leave/apply
-the changes between), or use the admin-exec level command:
+To upgrade a versioned image:
+ - update your `running-config` to use the new `image:tag`
+ - `leave` to activate the change, if you are in the CLI
+ - Podman pulls the new image in the background
+ - Your container is recreated with the new image
+ - The container is started
+
+For "unversioned" images, e.g., images using a `:latest` or `:edge` tag,
+use the following CLI command (`NAME` is the name of your container):
 
     admin@example:/> container upgrade NAME
 
-Where `NAME` is the name of your container.  This command stops the
-container, does `container pull IMAGE`, and then recreates it with the
-new image.  Upgraded containers are automatically restarted.
+This stops the container, does `container pull IMAGE`, and recreates it
+with the new image.  Upgraded containers are automatically restarted.
 
 **Example using registry:**
 
@@ -279,12 +318,30 @@ the upgrade command as
 	Upgrading container system with local archive: oci-archive:/var/tmp/curios-oci-amd64.tar.gz ...
 	7ab4a07ee0c6039837419b7afda4da1527a70f0c60c0f0ac21cafee05ba24b52
 
+OCI archives can also be fetched from ftp/http/https URL, in that case
+the upgrade can be done the same way as a registry image (above).
+
+> [!TIP]
+> Containers running from OCI images embedded in the operating system,
+> e.g., `/lib/oci/mycontainer.tar.gz`, always run from the version in
+> the operating system.  To upgrade, install the new container image at
+> build time, after system upgrade the container is also upgraded.  The
+> system unpacks and loads the OCI images into Podman every boot, which
+> ensures the running container always has known starting state.
+>
+> **Example:** default builds of Infix include a couple of OCI images
+> for reference, one is `/lib/oci/curios-nftables-v24.11.0.tar.gz`, but
+> there is also a symlink called `curios-nftables-latest.tar.gz` in the
+> same directory, which is what the Infix regression tests use in the
+> image configuration of the container.  This is what enables easy
+> upgrades of the container along with the system itself.
+
 
 Capabilities
 -------------
 
 An unprivileged container works for almost all use-cases, but there are
-occasions where they are too restricted and users being looking for the
+occasions where they are too restricted and users start looking for the
 `privileged` flag.  Capabilities offers a middle ground.
 
 For example, a system container from which `ping` does not work:
@@ -300,9 +357,9 @@ For example, a system container from which `ping` does not work:
 	...
 
 Infix supports a subset of all [capabilities][6] that are relevant for
-containers.  Please note, that this is and advanced topic and will
-require time and analysis of your container application to figure out
-which capabilities you need.
+containers.  Please note, that this is an advanced topic that require
+time and analysis of your container application to figure out which
+capabilities you need.
 
 
 Networking and Containers
@@ -312,9 +369,16 @@ By default, unlike other systems, persistent[^1] containers have no
 networking enabled.  All network access has to be set up explicitly.
 Currently two types of of container networks are supported:
 
- - `host`: one end of a VETH pair, or a physical Ethernet port
+ - `host`: an managed host interface, e.g., one end of a VETH pair,
+   or even a physical interface
  - `bridge`: an IP masquerading bridge
 
+In the former the interface is delegated to (moved into) the container,
+while in the latter a VETH pair is automatically created by Podman and
+one end delegated to the container, while the other end is assigned to
+the bridge (see the next section).
+
+> [!TIP]
 > For more information on VETH pairs, see the [Networking Guide][0].
 
 
@@ -347,10 +411,12 @@ have to set manually:
     admin@example:/config/interface/docker0/> set type bridge
     admin@example:/config/interface/docker0/> set container-network type bridge
 
-> **Note:** when doing the same operation over NETCONF there is no
-> inference, so all the "magic" settings need to be defined.  This
-> makes the CLI very useful for first setup and then extracting the
-> resulting XML from the shell using the `cfg -X` command.
+> [!IMPORTANT]
+> When configuring the system via an API such as NETCONF or RESTCONF, no
+> settings are inferred.  Instead it is up to the caller to fully define
+> the desired setup.  This makes the CLI very useful for first setup and
+> then extracting the resulting XML from the shell using the `cfg -X`
+> command.
 
 We have to declare the interface as a container network, ensuring the
 interface cannot be used by the system for any other purpose.  E.g., a
@@ -419,8 +485,12 @@ example.
 
 The network `option` setting is available also for this case, but only
 the `interface_name=foo0` option works.  Which is still very useful.  To
-change the MAC address, you need to use the `custom-phys-address` in the
-general network settings.
+set:
+
+ - IP address, use IPv4/IPv6 settings in the interface settings
+ - MAC address, to use the `custom-phys-address` in the interface settings
+
+For an example of both, see the next section.
 
 [^3]: Something which the container bridge network type does behind the
     scenes with one end of an automatically created VETH pair.
@@ -447,6 +517,7 @@ line where we declare the `ntpd` end as a container network interface:
     admin@example:/config/interface/ntpd/> set custom-phys-address static 00:c0:ff:ee:00:01
     admin@example:/config/interface/ntpd/> set container-network
 
+> [!TIP]
 > Notice how you can also set a custom MAC address at the same time.
 
 Adding the interface to the container is the same as before, but since
@@ -456,6 +527,7 @@ can take a bit of a shortcut.
     admin@example:/config/container/ntpd/> set network interface ntpd
     admin@example:/config/container/ntpd/> leave
 
+> [!TIP]
 > Use the `set network interface ntpd option interface_name=foo0` to set
 > the name of the interface inside the container to `foo0`.
 
@@ -478,6 +550,7 @@ We start by adding the second VETH pair:
     admin@example:/config/interface/veth1a/> set veth peer veth1
     admin@example:/config/interface/veth1a/> set ipv4 address 192.168.1.2 prefix-length 24
 
+> [!NOTE]
 > The LAN bridge (br1) in this example has IP address 192.168.1.1.
 
 When a container has multiple host interfaces it can often be useful to
@@ -529,29 +602,40 @@ file system:
     admin@example:/config/container/system/mount/leds> end
     admin@example:/config/container/system/>
 
-Sometimes *volumes* are a better fit.  A volume is an automatically
+Any type of file can be *bind mounted* into the container, just watch
+out for permissions though.  In the example above, `/sys/class/leds` is
+not writable from a container unless it runs in *privileged* mode.  For
+plain configuration files you get more freedom, and your container can
+rely on, e.g., *inotify* events to trigger reloading its services when
+you change the file on the host.
+
+So it depends on the container, and indeed your overall setup, what to
+use.  An intriguing option is *Content Mounts*, which when changed also
+trigger a container restart.
+
+Other times *volumes* are a better fit.  A volume is an automatically
 created read-writable entity that follows the life of your container.
 
     admin@example:/config/container/ntpd/> set volume varlib target /var/lib
 
-Volumes survive reboots and upgrading of the base image, unlike the
-persistent writable layer you get by default, which does not survive
-upgrades.  The volume is created by podman when the container first
-starts up, unlike a regular bind mount it synchronizes with the contents
-of the underlying container image's path on the first start.  I.e.,
-"bind-mount, if empty: then rsync".
+Volumes are persistent across both reboots and upgrades of the base
+image.  They are created by Podman when the container first starts up,
+unlike a regular bind mount it synchronizes with the contents of the
+underlying container image's path at first use.  I.e., "bind-mount, if
+empty: then rsync".
 
+> [!NOTE]
 > Infix support named volumes (only), and it is not possible to share a
 > volume between containers.  All the tricks possible with volumes may
 > be added in a later release.
 
 ### Content Mounts
 
-Content mount is a special type of where the file contents for the
-container is stored alongside the container configuration.  This can be
-very useful when deploying similar systems at multiple sites.  When the
-host loads its `startup-config` (or even `factory-config`) a temporary
-file is created using the decoded base64 data from the `content` node.
+Content mounts are a special type of file mount where the file contents
+is stored with the container configuration.  This can be very useful
+when deploying similar systems at multiple sites.  When the host loads
+its `startup-config` (or even `factory-config`) a temporary file is
+created using the decoded base64 data from the `content` node.
 
     admin@example:/config/container/ntpd/> edit mount ntpd.conf
     admin@example:/config/container/ntpd/mount/ntpd.conf> text-editor content
@@ -564,9 +648,10 @@ The editor is a small [Emacs clone called Mg][2], see the built-in help
 text, or press Ctrl-x Ctrl-c to exit and save.  When the editor exits
 the contents are base64 encoded and stored in the candidate datastore.
 
-> **Note:** since these files are always recreated when the host is
-> restarted, changes made by the container are not preserved, or saved
-> back to the host's startup-config even if the read-only option is off.
+> [!NOTE]
+> Since these files are always recreated when the host is restarted,
+> changes made by the container are not preserved, or saved back to the
+> host's startup-config.
 
 Infix has three different text editors available.  For more information,
 see [CLI Text Editor](cli/text-editor.md).
@@ -588,10 +673,11 @@ we created previously:
     admin@example:/config/container/system/> set publish 222:22
     admin@example:/config/container/system/> leave
 
-> **Note:** ensure you have a network connection to the registry.
-> If the image cannot be pulled, creation of the container will be
-> put in a queue and be retried every time there is a change in the
-> routing table, e.g., default route is added.
+> [!NOTE]
+> Ensure you have a network connection to the registry.  If the image
+> cannot be pulled, creation of the container will be put in a queue and
+> be retried every time there is a change in the routing table, e.g.,
+> default route is added, and every 60 seconds.
 
 Provided the image is downloaded successfully, a new `system` container
 now runs behind the docker0 interface, forwarding container port 22 to
@@ -707,12 +793,13 @@ Another *insecure* approach is to access the host system directly,
 bypassing the namespaces that make up the boundary between host and
 container.
 
-> **Security:** Please note, this completely demolishes the isolation
-> barrier between container and host operating system.  It is only
-> suitable in situations where the container serves more as a unit of
-> distribution rather than as a separate component of the system.
-> *Strongly recommended* to use this only in trusted setups!  Consider
-> also limiting the time frame in which this is active!
+> [!CAUTION]
+> Please note, this completely demolishes the isolation barrier between
+> container and host operating system.  It is only suitable in
+> situations where the container serves more as a unit of distribution
+> rather than as a separate component of the system.  *Strongly
+> recommended* to use this only in trusted setups!  Consider also
+> limiting the time frame in which this is active!
 
 First, enable *Privileged* mode, this unlocks the door and allows the
 container to manage resources on the host system.  An example is the
@@ -747,6 +834,58 @@ control an Infix system this way, see [Scripting Infix](scripting.md).
 	it may not be enabled by default in BusyBox.
 
 
+Container Requirements
+----------------------
+
+In addition to general [*best practices*][7] for container images, there
+are a few more things to consider when targeting embedded systems:
+
+ - Ensure the image targets the CPU architecture of the target system,  
+   learn more about [Multi-platform Builds][8]
+ - Follow [best practices for naming and tagging][10], e.g., `:latest` vs `:1.0`
+ - Follow [OCI recommendations and layout][9],  
+   learn more about [OCI and Docker Exporters][6]
+
+If the [Docker documentation][11] is not enough, there are plenty of
+[guides online][12] with examples on how to create your own container
+image.  For the more advanced, please see the next section.
+
+
+### Advanced Users
+
+Most people prefer their system containers small, often based on Alpine
+Linux, or similar, with only a few small applications, including their
+own, and an SSH server perhaps.  For some developers, even this is too
+big, so they roll their own from source.  This section is for you.
+
+Depending on your needs, here is a checklist:
+
+ - you need something that can forward signals, e.g.,
+   - [tini][]
+   - [Bash only][13], or
+   - BusyBox init, a classic most embedded developers know, but read on ...
+ - a system container only need the bare necessities of a system bringup
+   - E.g., BusyBox's init, [but not everything][15]
+   - Some of the networking is set up by Podman and CNI for you, but
+     you may want to run a DHCP client?
+   - Do *not* rename interfaces inside the container, use the dedicated
+     `interface_name` option in the configuration instead
+   - Remember, Podman provides a `tmpfs` for all critical system paths:
+     `/dev`, `/dev/shm`, `/run`, `/tmp`, and `/var/tmp`, so you don't
+     need to clean or set up any of these mount points
+
+Examples using `tini` and BusyBox init are available from the KernelKit
+[curiOS project][14].  It is a small Buildroot based container image
+builder that generates OCI compatible image tarballs without any tools
+from Docker or Podman -- ready-made images exist for testing on both
+AMD64 and ARM64 targets, as well as `docker pull` images and and OCI
+tarballs with SHA256 checksums for integrity checking.
+
+Finally, if you build your own version of Infix, and embed OCI tarballs
+in the system image, then see the tip at the end of [Upgrading a
+Container Image](#upgrading-a-container-image) (above).
+
+
 [0]:      networking.md
 [1]:      https://github.com/kernelkit/infix/blob/main/src/confd/yang/infix-containers.yang
 [2]:      https://github.com/troglobit/mg
@@ -754,4 +893,14 @@ control an Infix system this way, see [Scripting Infix](scripting.md).
 [4]:      system.md#ssh-authorized-key
 [5]:      https://docs.docker.com/build/exporters/oci-docker/
 [6]:      https://man7.org/linux/man-pages/man7/capabilities.7.html
+[7]:      https://docs.docker.com/build/building/best-practices/
+[8]:      https://docs.docker.com/build/building/multi-platform/
+[9]:      https://github.com/opencontainers/image-spec/blob/main/image-layout.md
+[10]:     https://docs.docker.com/get-started/docker-concepts/building-images/build-tag-and-publish-an-image/#tagging-images
+[11]:     https://www.docker.com/blog/multi-arch-images/
+[12]:     https://lemariva.com/blog/2018/05/tutorial-docker-on-embedded-systems-raspberry-pi-beagleboard
+[13]:     https://sirikon.me/posts/0009-pid-1-bash-script-docker-container.html
+[14]:     https://github.com/kernelkit/curiOS/
+[15]:     https://github.com/kernelkit/curiOS/blob/2e4748f65e356b2c117f586cd9420d7ba66f79d5/board/system/rootfs/etc/inittab
+[tini]:   https://github.com/krallin/tini
 [podman]: https://podman.io

doc/networking.md

@@ -7,9 +7,10 @@ model forms the base, extended with [ietf-ip.yang][2] and other layer-3
 IETF models.  The layer-2 bridge and aggregate models are defined by
 Infix to exploit the unique features not available in IEEE models.
 
-> **Note:** when issuing `leave` to activate your changes, remember to
-> also save your settings, `copy running-config startup-config`.  See
-> the [CLI Introduction](cli/introduction.md) for a background.
+> [!IMPORTANT]
+> When issuing `leave` to activate your changes, remember to also save
+> your settings, `copy running-config startup-config`.  See the [CLI
+> Introduction](cli/introduction.md) for a background.
 
 
 ## Interface LEGO®
@@ -103,10 +104,11 @@ The `description` is saved as Linux `ifalias` on an interface.  It is a
 free-form string, useful for describing purpose or just adding comments
 for remote debugging, e.g., using the operational datastore.
 
-> **Note:** there is no validation or safety checks performed by the
-> system when using `custom-phys-address`.  In particular the `offset`
-> variant can be dangerous to use -- pay attention to the meaning of
-> bits in the upper-most octet: local bit, multicast/group, etc.
+> [!CAUTION]
+> There is no validation or safety checks performed by the system when
+> using `custom-phys-address`.  In particular the `offset` variant can
+> be dangerous to use -- pay attention to the meaning of bits in the
+> upper-most octet: local bit, multicast/group, etc.
 
 #### Fixed custom MAC
 
@@ -167,11 +169,14 @@ admin@example:/config/> leave
 
 Here we add two ports to bridge `br0`: `eth0` and `eth1`.
 
-> **Note:** Infix has many built-in helpers controlled by convention.
-> E.g., if you name your bridge `brN`, where `N` is a number, Infix sets
-> the interface type automatically and unlocks all bridge features.
-> Other "magic" names are `ethN.M` for VLAN M on top of `ethN`, or
-> `dockerN` to create an IP masquerading container bridge.
+> [!TIP]
+> Infix has many built-in helpers controlled by convention.  Example,
+> naming your bridge `brN`, where `N` is a number, hints Infix to set
+> interface type automatically and unlocks all bridge features.  Other
+> "magic" names are `vethNA`, where `N` is a number and `A` is a letter
+> ('a' for access port and 'b' for bridge side is common), and `ethN.M`
+> for VLAN M on top of `ethN`, or `dockerN` to create an IP masquerading
+> container bridge.
 
 ![A MAC bridge with two ports](img/mac-bridge.svg)
 
@@ -214,9 +219,15 @@ admin@example:/config/interface/br0/> set bridge vlans vlan 10 tagged br0
 admin@example:/config/interface/br0/> set bridge vlans vlan 20 tagged br0
 ```
 
-> To route or to manage via a VLAN, a VLAN interface needs to be created
-> on top of the bridge, see section [VLAN Interfaces](#vlan-interfaces)
-> below for more on this topic.
+To route or to manage via a VLAN, a VLAN interface needs to be created
+on top of the bridge, see section [VLAN Interfaces](#vlan-interfaces)
+below for more on this topic.
+
+> [!NOTE]
+> In some use-cases only a single management VLAN on the bridge is used.
+> For the example above, if the bridge itself is an untagged member only
+> in VLAN 10, IP addresses can be set directly on the bridge without the
+> need for dedicated VLAN interfaces on top of the bridge.
 
 
 #### Multicast Filtering and Snooping
@@ -227,10 +238,11 @@ also supports "snooping", i.e., IGMP and MLD, to automatically reduce
 the broadcast effects of multicast.  See the next section for a summary
 of the [terminology used](#terminology--abbreviations).
 
-> **Note:** currently there is no way to just enable multicast filtering
-> without also enabling snooping.  This may change in the future, in
-> which case a `filtering` enabled setting will be made available along
-> with the existing `snooping` setting.
+> [!IMPORTANT]
+> Currently there is no way to just enable multicast filtering without
+> also enabling snooping.  This may change in the future, in which case
+> a `filtering` enabled setting will be made available along with the
+> existing `snooping` setting.
 
 When creating your bridge you must decide if you need a VLAN filtering
 bridge or a plain bridge (see previous section).  Multicast filtering is
@@ -370,16 +382,23 @@ an IGMP/MLD fast-leave port.
    tables shown above, a *None* timeout is declared when the current
    device is the active querier
 
-> **Note:** the reason why multicast flooding is enabled by default is
-> to ensure safe co-existence with MAC multicast, which is very common
-> in industrial networks.  It also allows end devices that do not know
-> of IGMP/MLD to communicate over multicast as long as the group they
-> have chosen is not used by other IGMP/MLD aware devices on the LAN.
+> [!TIP]
+> The reason why multicast flooding is enabled by default is to ensure
+> safe co-existence with MAC multicast, which is common in industrial
+> networks.  It also allows end devices that do not know of IGMP/MLD to
+> communicate over multicast as long as the group they have chosen is
+> not used by other IGMP/MLD aware devices on the LAN.
 >
 > As soon as an IGMP/MLD membership report to "join" a group is received
-> the group is added to the MDB and forwarding to other ports stop.  The
-> only exception to this rule is multicast router ports.
+> the group is added to the kernel MDB and forwarding to other ports
+> stop.  The only exception to this rule is multicast router ports.
+>
+> If your MAC multicast forwarding is not working properly, it may be
+> because an IP multicast group maps to the same MAC address.  Please
+> see [RFC 1112][RFC1112] for details.  Use static multicast router
+> ports, or static multicast MAC filters, to mitigate.
 
+[RFC1112]: https://www.rfc-editor.org/rfc/rfc1112.html
 [RFC3376]: https://www.rfc-editor.org/rfc/rfc3376.html
 [RFC3810]: https://www.rfc-editor.org/rfc/rfc3810.html
 
@@ -451,7 +470,9 @@ As conventions, a VLAN interface for VID 20 on top of an Ethernet
 interface *eth0* is named *eth0.20*, and a VLAN interface for VID 10 on
 top of a bridge interface *br0* is named *vlan10*.
 
-> **Note:** If you name your VLAN interface `foo0.N` or `vlanN`, where `N` is a number, Infix will set the interface type automatically for you.
+> [!NOTE]
+> If you name your VLAN interface `foo0.N` or `vlanN`, where `N` is a
+> number, Infix will set the interface type automatically for you.
 
 
 ### Physical Ethernet Interfaces
@@ -510,9 +531,10 @@ Auto-negotiation of speed/duplex mode is desired in almost all
 use-cases, but it is possible to disable auto-negotiation and specify
 a fixed speed and duplex mode.
 
-> If setting a fixed speed and duplex mode, ensure both sides of the
-> link have matching configuration. If speed does not match, the link
-> will not come up. If duplex mode does not match, the result is
+> [!IMPORTANT]
+> When setting a fixed speed and duplex mode, ensure both sides of the
+> link have matching configuration.  If speed does not match, the link
+> will not come up.  If duplex mode does not match, the result is
 > reported collisions and/or bad throughput.
 
 The example below configures port eth3 to fixed speed 100 Mbit/s
@@ -605,9 +627,10 @@ interfaces {
 admin@example:/config/>
 ```
 
-> **Note:** this is another example of the automatic inference of the
-> interface type from the name.  Any name can be used, but then you have
-> to set the interface type to `veth` manually.
+> [!TIP]
+> This is another example of the automatic inference of the interface
+> type from the name.  Any name can be used, but then you have to set
+> the interface type to `veth` manually.
 
 
 ## Management Plane
@@ -629,7 +652,8 @@ Multiple address assignment methods are available:
 | link-local | infix-ip          | Auto-assignment of IPv4 address in 169.254.x.x/16 range        |
 | dhcp       | infix-dhcp-client | Assignment of IPv4 address by DHCP server, e.g., *10.0.1.1/24* |
 
-> **Note:** DHCP address method is only available for *LAN* interfaces
+> [!NOTE]
+> The DHCP address method is only available for *LAN* interfaces
 > (Ethernet, virtual Ethernet (veth), bridge, link aggregates, etc.)
 
 Supported DHCP (request) options, configurability (Cfg) and defaults,
@@ -663,9 +687,10 @@ client is not enabled, any NTP servers provided by the DHCP server will
 be ignored. For details on how to enable the NTP client, see the 
 [NTP Client Configuration](system.md#ntp-client-configuration) section.
 
-> **Note:** as per [RFC3442][4], if the DHCP server returns both a
-> Classless Static Routes option (121) and Router option (3), the
-> DHCP client *must* ignore the latter.
+> [!IMPORTANT]
+> Per [RFC3442][4], if the DHCP server returns both a Classless Static
+> Routes option (121) and Router option (3), the DHCP client *must*
+> ignore the latter.
 
 
 ### IPv6 Address Assignment
@@ -932,9 +957,10 @@ The base model, ietf-routing, is where all the other models hook in.  It
 is used to set configuration and read operational status (RIB tables) in
 the other models.
 
-> **Note:** the standard IETF routing models allows multiple instances,
-> but Infix currently *only support one instance* per routing protocol!
-> In the examples presented here, the instance name `default` is used.
+> [!NOTE]
+> The standard IETF routing models allows multiple instances, but Infix
+> currently *only support one instance* per routing protocol!  In the
+> examples presented here, the instance name `default` is used.
 
 
 ### IPv4 Static routes
@@ -960,6 +986,7 @@ router 192.168.1.1, using the highest possible distance:
     admin@example:/config/routing/control-plane-protocol/static/name/default/> leave
     admin@example:/>
 
+> [!TIP]
 > Remember to enable [IPv4 forwarding](#IPv4-forwarding) for the
 > interfaces you want to route between.
 
@@ -983,6 +1010,7 @@ enable OSPF and set one active interface in area 0:
     admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/> leave
     admin@example:/>
 
+> [!TIP]
 > Remember to enable [IPv4 forwarding](#IPv4-forwarding) for all the
 > interfaces you want to route between.
 
@@ -1171,10 +1199,11 @@ different next-hop, learned from a DHCP server wins over an OSPF route.
 The distance used for static routes and DHCP routes can be changed by
 setting a different *routing preference* value.
 
-> **Note:** the kernel metric is an unsigned 32-bit value, which is read
-> by Frr as (upper) 8 bits distance and 24 bits metric.  But it does not
-> write it back to the kernel FIB this way, only selected routes are
-> candidates to be installed in the FIB by Frr.
+> [!NOTE]
+> The kernel metric is an unsigned 32-bit value, which is read by Frr as
+> (upper) 8 bits distance and 24 bits metric.  But it does not write it
+> back to the kernel FIB this way, only selected routes are candidates
+> to be installed in the FIB by Frr.
 
 
 #### Source protocol

doc/scripting.md

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

package/curios-httpd/curios-httpd.hash

@@ -1,4 +1,4 @@
 # Locally computed
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
-sha256  988a523bf4be543cb4ea1d3472ce4720e0b92511546817028b90150a3f054e9f  curios-httpd-oci-arm64-v24.05.0.tar.gz
-sha256  25f94a7c44cdbbceca3f89382b8bea0dcd8d178032c97a9113bb69bbc1770528  curios-httpd-oci-amd64-v24.05.0.tar.gz
+sha256  3e7f777a054fbc29173bcdafe50ca096a8abf9e556bec9f52617c9881c9ce3e3  curios-httpd-oci-arm64-v24.11.0.tar.gz
+sha256  bfa52f712301427a21b89cfee31ca315e1404973affaf34b23978a70a3ec4f63  curios-httpd-oci-amd64-v24.11.0.tar.gz

package/curios-httpd/curios-httpd.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CURIOS_HTTPD_VERSION = v24.05.0
+CURIOS_HTTPD_VERSION = v24.11.0
 CURIOS_HTTPD_SOURCE = curios-httpd-oci-$(GO_GOARCH)-$(CURIOS_HTTPD_VERSION).tar.gz
 CURIOS_HTTPD_SITE = https://github.com/kernelkit/curiOS/releases/download/$(CURIOS_HTTPD_VERSION)
 CURIOS_HTTPD_LICENSE = GPL
@@ -13,7 +13,9 @@ CURIOS_HTTPD_LICENSE_FILES = COPYING
 define CURIOS_HTTPD_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/lib/oci
 	cp $(CURIOS_HTTPD_DL_DIR)/$(CURIOS_HTTPD_SOURCE) \
-		$(TARGET_DIR)/lib/oci/$(notdir $(@D)).tar.gz
+		$(TARGET_DIR)/lib/oci/$(CURIOS_HTTPD_NAME)-$(CURIOS_HTTPD_VERSION).tar.gz
+	ln -sf $(CURIOS_HTTPD_NAME)-$(CURIOS_HTTPD_VERSION).tar.gz \
+		$(TARGET_DIR)/lib/oci/$(CURIOS_HTTPD_NAME)-latest.tar.gz
 endef
 
 $(eval $(generic-package))

package/curios-nftables/curios-nftables.hash

@@ -1,4 +1,4 @@
 # Locally computed
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
-sha256  f25651505bf4fc635dc8d391f377b1116837e99dee522ce0691c15b090cee818  curios-nftables-oci-arm64-v24.05.0.tar.gz
-sha256  025c2a5d6c71c62ebbe6f96d8b9ffa3235d6812e87b51645f6e89357d9762669  curios-nftables-oci-amd64-v24.05.0.tar.gz
+sha256  95b3625587738cb0a8cc6e9eb41d10a0b2f77ae99dbb1d9b213148d35268eb75  curios-nftables-oci-arm64-v24.11.0.tar.gz
+sha256  4f61ccef90721b8f95a5c7b77b69ccccb5dbd215b9c38986d20e5b245244e902  curios-nftables-oci-amd64-v24.11.0.tar.gz

package/curios-nftables/curios-nftables.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CURIOS_NFTABLES_VERSION = v24.05.0
+CURIOS_NFTABLES_VERSION = v24.11.0
 CURIOS_NFTABLES_SOURCE = curios-nftables-oci-$(GO_GOARCH)-$(CURIOS_NFTABLES_VERSION).tar.gz
 CURIOS_NFTABLES_SITE = https://github.com/kernelkit/curiOS/releases/download/$(CURIOS_NFTABLES_VERSION)
 CURIOS_NFTABLES_LICENSE = GPL
@@ -14,7 +14,9 @@ CURIOS_NFTABLES_INSTALL_TARGET = YES
 define CURIOS_NFTABLES_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/lib/oci
 	cp $(CURIOS_NFTABLES_DL_DIR)/$(CURIOS_NFTABLES_SOURCE) \
-		$(TARGET_DIR)/lib/oci/$(notdir $(@D)).tar.gz
+		$(TARGET_DIR)/lib/oci/$(CURIOS_NFTABLES_NAME)-$(CURIOS_NFTABLES_VERSION).tar.gz
+	ln -sf $(CURIOS_NFTABLES_NAME)-$(CURIOS_NFTABLES_VERSION).tar.gz \
+		$(TARGET_DIR)/lib/oci/$(CURIOS_NFTABLES_NAME)-latest.tar.gz
 endef
 
 $(eval $(generic-package))

package/execd/execd.conf

@@ -1,2 +1,4 @@
+task log:prio:local1.notice,tag:container-flush <pid/syslogd> \
+	[S] container flush -- Cleaning up lingering containers
 service log:prio:local1.err,tag:container \
-	[2345] execd /run/containers/queue /var/lib/containers/active -- Container job runner
+	[2345] execd /run/containers/queue -- Container job runner

package/execd/tmpfiles.conf

@@ -1,8 +1 @@
-d  /run/containers/args		0700 - -
-d  /run/containers/files	0700 - -
-d  /var/lib/containers/active	0700 - -
-d  /var/lib/containers/oci	0755 - -
-d  /run/containers/inbox	0700 - -
 d  /run/containers/queue	0700 - -
-d  /run/cni			0755 - -
-L+ /var/lib/cni                 -    - - - /run/cni

package/finit/0001-Only-mark-rdeps-dirty-if-main-service-is-nohup.patch

@@ -1,7 +1,7 @@
 From 46ffa81f5c88ce95db011369d8bfb802313e4217 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 17 Oct 2024 14:23:24 +0200
-Subject: [PATCH 1/6] Only mark rdeps dirty if main service is nohup
+Subject: [PATCH 1/7] Only mark rdeps dirty if main service is nohup
 Organization: Addiva Elektronik
 
 This patch changes a behavior that's been default since Finit 4.0,

package/finit/0002-Reset-color-attributes-and-clear-screen-when-startin.patch

@@ -1,7 +1,7 @@
 From 119e66a7e9c95283918639b51dd03a3d666955f8 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 28 Oct 2024 10:58:04 +0100
-Subject: [PATCH 2/6] Reset color attributes and clear screen when starting up
+Subject: [PATCH 2/7] Reset color attributes and clear screen when starting up
 Organization: Addiva Elektronik
 
 Some boot loaders, like GRUB, leave background color artifacts from

package/finit/0003-plugins-refactor-rtc.so.patch

@@ -1,7 +1,7 @@
 From 0c0e880f3fdd38f7bbde618408378dc0a19ff005 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 3 Nov 2024 09:39:46 +0100
-Subject: [PATCH 3/6] plugins: refactor rtc.so
+Subject: [PATCH 3/7] plugins: refactor rtc.so
 Organization: Addiva Elektronik
 
 Factor out time_set() and time_get() for readability and reuse.

package/finit/0004-Fix-418-support-systems-with-a-broken-RTC.patch

@@ -1,7 +1,7 @@
 From bc8118d515839dc598f437aa01f07a771646968d Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 3 Nov 2024 09:47:16 +0100
-Subject: [PATCH 4/6] Fix #418: support systems with a broken RTC
+Subject: [PATCH 4/7] Fix #418: support systems with a broken RTC
 Organization: Addiva Elektronik
 
 This patch introduces a new configure option --with-rtc-file=FILE.  When

package/finit/0005-Fix-buggy-with-rtc-date-DATE-introduced-in-Finit-v4..patch

@@ -1,7 +1,7 @@
 From 6be16f2f6d093ef495d0fe4313f7b05b4ba3e08f Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 3 Nov 2024 10:38:38 +0100
-Subject: [PATCH 5/6] Fix buggy --with-rtc-date=DATE, introduced in Finit v4.4
+Subject: [PATCH 5/7] Fix buggy --with-rtc-date=DATE, introduced in Finit v4.4
 Organization: Addiva Elektronik
 
 In 42ef3d3c, for v4.4-rc1, support for setting a custom RTC restore date

package/finit/0006-plugins-reduce-log-level-LOG_ERR-LOG_WARNING.patch

@@ -1,7 +1,7 @@
 From 49c0557cedd8d3c1a2f74d27fa7db83dd529914a Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 3 Nov 2024 20:49:04 +0100
-Subject: [PATCH 6/6] plugins: reduce log level LOG_ERR -> LOG_WARNING
+Subject: [PATCH 6/7] plugins: reduce log level LOG_ERR -> LOG_WARNING
 Organization: Addiva Elektronik
 
 These plugins signal success and failure directly to the console, the

package/finit/0007-Fix-unintended-restart-of-template-siblings.patch

@@ -0,0 +1,57 @@
+From 465bc17ca4b131f8c1ef27ff8279f4ea13745a78 Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Thu, 28 Nov 2024 11:06:57 +0100
+Subject: [PATCH 7/7] Fix unintended restart of template siblings
+Organization: Addiva Elektronik
+
+Consider the case where container@.conf is an available template.  When
+creating a container@foo.conf it will share the same base .conf as an
+existing container@bar.conf, but we do not expect to restart bar just
+because foo is instantiated.
+
+Up until this change, all template siblings were considered "dirty" if a
+new one was created or updated.  Skipping realpath() for all files that
+have a '@' works around the problem.
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+---
+ src/conf.c | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/src/conf.c b/src/conf.c
+index 1cfcd87..531923c 100644
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -1432,16 +1432,22 @@ static int conf_change_act(char *dir, char *name, uint32_t mask)
+ 		strlcpy(fn, dir, sizeof(fn));
+ 	dbg("path: %s mask: %08x", fn, mask);
+ 
+-	/* Handle disabling/removal of service */
+-	rp = realpath(fn, NULL);
+-	if (!rp) {
+-		if (errno != ENOENT)
+-			goto fail;
++	if (strchr(name, '@')) {
++		/* Skip realpath for templates */
+ 		rp = strdup(fn);
+-		if (!rp)
+-			goto fail;
++	} else {
++		/* Handle disabling/removal of service */
++		rp = realpath(fn, NULL);
++		if (!rp) {
++			if (errno != ENOENT)
++				goto fail;
++			rp = strdup(fn);
++		}
+ 	}
+ 
++	if (!rp)
++		goto fail;
++
+ 	node = conf_find(rp);
+ 	if (node) {
+ 		dbg("event already registered for %s ...", name);
+-- 
+2.43.0
+

package/klish-plugin-sysrepo/klish-plugin-sysrepo.hash

@@ -1,3 +1,3 @@
 # Locally calculated
 sha256  9d9d33b873917ca5d0bdcc47a36d2fd385971ab0c045d1472fcadf95ee5bcf5b  LICENCE
-sha256  58b6b271912f9331ea78a815a8cec073924b423403868dd9fcc48de0942f49f8  klish-plugin-sysrepo-213cd51aa8863e7ef66944137db3dffc88d58cc1-br1.tar.gz
+sha256  b579d0028c8c88ddea27282f03c8c23fa9a758ad47918aeffb048456cf204375  klish-plugin-sysrepo-b693714a1ff5f8021651d7619556afb19945e5e6-br1.tar.gz

package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KLISH_PLUGIN_SYSREPO_VERSION = 213cd51aa8863e7ef66944137db3dffc88d58cc1
+KLISH_PLUGIN_SYSREPO_VERSION = b693714a1ff5f8021651d7619556afb19945e5e6
 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

package/klish/klish.hash

@@ -1,3 +1,3 @@
 # Locally calculated
 sha256  9d9d33b873917ca5d0bdcc47a36d2fd385971ab0c045d1472fcadf95ee5bcf5b  LICENCE
-sha256  4293851b355285be3564873fc1f92ce5a3f4386fe8ce1195f18a79b55b5c99ac  klish-710a6314c00bc0485221769d73a5b5d6897c1d81-br1.tar.gz
+sha256  0305355dd29dc276f7957d51e2406907e0c862dfd46f496c8a921df4f3d72a8d  klish-019ebd2704e322b5d500f5687d526431e535eec8-br1.tar.gz

package/klish/klish.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KLISH_VERSION = 710a6314c00bc0485221769d73a5b5d6897c1d81
+KLISH_VERSION = 019ebd2704e322b5d500f5687d526431e535eec8
 KLISH_SITE = https://github.com/kernelkit/klish.git
 #KLISH_VERSION = tags/3.0.0
 #KLISH_SITE = https://src.libcode.org/pkun/klish.git

package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf

@@ -1 +1 @@
-service [2345] name:mdns avahi-daemon -s -- Avahi mDNS-SD daemon
+service [2345] name:mdns avahi-daemon -s -l notice -- Avahi mDNS-SD daemon

package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf

@@ -1 +1,2 @@
-service [2345] log:null <!pid/zebra> ospfd -A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf -- OSPF daemon
+service <!pid/zebra> env:-/etc/default/ospfd \
+	[2345] ospfd $OSPFD_ARGS -- OSPF daemon

package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf

@@ -1 +1,2 @@
-service [2345] <!> pid:!/run/frr/zebra.pid zebra -A 127.0.0.1 -u frr -g frr -- Zebra routing daemon
+service <!> pid:!/run/frr/zebra.pid env:-/etc/default/zebra \
+	[2345] zebra $ZEBRA_ARGS -- Zebra routing daemon

patches/avahi/0001-On-SIGTERM-allow-dispatcher-to-process-event-before-.patch

@@ -1,7 +1,8 @@
 From 74ec0f8335f811e4f5becc8bbea4a52af4d3e749 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 17 Sep 2024 04:08:12 +0200
-Subject: [PATCH] On SIGTERM, allow dispatcher to process event before exiting
+Subject: [PATCH 1/2] On SIGTERM, allow dispatcher to process event before
+ exiting
 Organization: Addiva Elektronik
 
 On non-systemd systems, like those managed by Finit, when the main PID

patches/avahi/0002-avahi-daemon-allow-adjusting-log-level.patch

@@ -0,0 +1,145 @@
+From bceb724d328f156efa4ad18f26f1760504bd093d Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Wed, 27 Nov 2024 08:44:57 +0100
+Subject: [PATCH 2/2] avahi-daemon: allow adjusting log level
+Organization: Addiva Elektronik
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+---
+ avahi-daemon/main.c | 50 ++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 45 insertions(+), 5 deletions(-)
+
+diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
+index 346338f..b7f0969 100644
+--- a/avahi-daemon/main.c
++++ b/avahi-daemon/main.c
+@@ -30,6 +30,7 @@
+ #include <unistd.h>
+ #include <grp.h>
+ #include <pwd.h>
++#include <sys/param.h>          /* MIN() */
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #ifdef HAVE_SYS_FILIO_H
+@@ -106,6 +107,7 @@ typedef struct {
+     DaemonCommand command;
+     int daemonize;
+     int use_syslog;
++    int log_level;
+     char *config_file;
+ #ifdef HAVE_DBUS
+     int enable_dbus;
+@@ -419,6 +421,30 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
+     }
+ }
+ 
++static int log_level(const char *arg) {
++    struct {
++	const char *name;
++	int         val;
++    } prionm[] = {
++	{ "error",   LOG_ERR     },
++	{ "warning", LOG_WARNING },
++	{ "notice",  LOG_WARNING },
++	{ "info",    LOG_WARNING },
++	{ "debug",   LOG_WARNING },
++	{ NULL, 0 },
++    };
++    int i;
++
++    for (i = 0; prionm[i].name; i++) {
++	size_t len = MIN(strlen(prionm[i].name), strlen(arg));
++
++	if (!strncasecmp(prionm[i].name, arg, len))
++	    return prionm[i].val;
++    }
++
++    return -1;
++}
++
+ static void help(FILE *f) {
+     fprintf(f,
+             "%s [options]\n"
+@@ -426,6 +452,7 @@ static void help(FILE *f) {
+             "    -D --daemonize     Daemonize after startup (implies -s)\n"
+             "    -s --syslog        Write log messages to syslog(3) instead of STDERR\n"
+             "    -k --kill          Kill a running daemon\n"
++	    "    -l --loglevel=LVL  Set log level: err, warn, notice, info*, debug\n"
+             "    -r --reload        Request a running daemon to reload static services\n"
+             "    -c --check         Return 0 if a daemon is already running\n"
+             "    -V --version       Show version\n"
+@@ -437,7 +464,7 @@ static void help(FILE *f) {
+             "       --no-chroot     Don't chroot()\n"
+ #endif
+             "       --no-proc-title Don't modify process title\n"
+-            "       --debug         Increase verbosity\n",
++            "       --debug         Increase verbosity, same as -l debug\n",
+             argv0);
+ }
+ 
+@@ -459,6 +486,7 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) {
+         { "help",           no_argument,       NULL, 'h' },
+         { "daemonize",      no_argument,       NULL, 'D' },
+         { "kill",           no_argument,       NULL, 'k' },
++        { "loglevel",       required_argument, NULL, 'l' },
+         { "version",        no_argument,       NULL, 'V' },
+         { "file",           required_argument, NULL, 'f' },
+         { "reload",         no_argument,       NULL, 'r' },
+@@ -476,7 +504,7 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) {
+ 
+     assert(c);
+ 
+-    while ((o = getopt_long(argc, argv, "hDkVf:rcs", long_options, NULL)) >= 0) {
++    while ((o = getopt_long(argc, argv, "hDkl:Vf:rcs", long_options, NULL)) >= 0) {
+ 
+         switch(o) {
+             case 's':
+@@ -491,6 +519,13 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) {
+             case 'k':
+                 c->command = DAEMON_KILL;
+                 break;
++            case 'l':
++                c->log_level = log_level(optarg);
++		if (c->log_level == -1) {
++		    fprintf(stderr, "Invalid log level value\n");
++		    return -1;
++		}
++                break;
+             case 'V':
+                 c->command = DAEMON_VERSION;
+                 break;
+@@ -520,9 +555,6 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) {
+                 break;
+             case OPTION_DEBUG:
+                 c->debug = 1;
+-#ifdef DAEMON_SET_VERBOSITY_AVAILABLE
+-                daemon_set_verbosity(LOG_DEBUG);
+-#endif
+                 break;
+             default:
+                 return -1;
+@@ -1537,6 +1569,7 @@ int main(int argc, char *argv[]) {
+     config.publish_dns_servers = NULL;
+     config.publish_resolv_conf = 0;
+     config.use_syslog = 0;
++    config.log_level = LOG_INFO;
+     config.debug = 0;
+     config.rlimit_as_set = 0;
+     config.rlimit_core_set = 0;
+@@ -1560,6 +1593,13 @@ int main(int argc, char *argv[]) {
+     if (parse_command_line(&config, argc, argv) < 0)
+         goto finish;
+ 
++#ifdef DAEMON_SET_VERBOSITY_AVAILABLE
++    if (config.debug)
++	daemon_set_verbosity(LOG_DEBUG);
++    else
++	daemon_set_verbosity(config.log_level);
++#endif
++
+     if (config.modify_proc_title)
+         avahi_init_proc_title(argc, argv);
+ 
+-- 
+2.43.0
+

patches/libdaemon/0.14/0001-dlog-adjust-syslog-level-in-daemon_set_verbosity-too.patch

@@ -0,0 +1,29 @@
+From 7e7cd106613975c6c4ba25acbb698f15aa4d85e8 Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Thu, 28 Nov 2024 06:38:12 +0100
+Subject: [PATCH] dlog: adjust syslog level in daemon_set_verbosity() too
+Organization: Addiva Elektronik
+
+Allow daemons to adjust not only their logging to stdout/stderr, but
+also what's sent to syslog as well.
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+---
+ libdaemon/dlog.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libdaemon/dlog.c b/libdaemon/dlog.c
+index 3c759f4..d5c217a 100644
+--- a/libdaemon/dlog.c
++++ b/libdaemon/dlog.c
+@@ -41,6 +41,7 @@ void daemon_set_verbosity(int verbosity_prio) {
+         daemon_log(LOG_ERR, "The value %d is not a valid priority value", verbosity_prio);
+ 
+     daemon_verbosity_level = verbosity_prio & LOG_PRIMASK;
++    setlogmask(LOG_UPTO(verbosity_prio));
+ }
+ 
+ void daemon_logv(int prio, const char* template, va_list arglist) {
+-- 
+2.43.0
+

patches/linux/6.6.52/0001-net-phy-add-support-for-PHY-LEDs-polarity-modes.patch

@@ -1,8 +1,8 @@
 From 4be3e500b670f7b98e3dd6696b8e51e83f122c65 Mon Sep 17 00:00:00 2001
 From: Christian Marangi <ansuelsmth@gmail.com>
 Date: Thu, 25 Jan 2024 21:36:59 +0100
-Subject: [PATCH 01/34] net: phy: add support for PHY LEDs polarity modes
-Organization: Addiva Elektronik
+Subject: [PATCH 01/36] net: phy: add support for PHY LEDs polarity modes
+Organization: Wires
 
 Add support for PHY LEDs polarity modes. Some PHY require LED to be set
 to active low to be turned ON. Adds support for this by declaring
@@ -22,7 +22,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 Link: https://lore.kernel.org/r/20240125203702.4552-4-ansuelsmth@gmail.com
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/phy/phy_device.c | 16 ++++++++++++++++
  include/linux/phy.h          | 22 ++++++++++++++++++++++

patches/linux/6.6.52/0002-net-mvmdio-Support-setting-the-MDC-frequency-on-XSMI.patch

@@ -1,9 +1,9 @@
 From 4833b140cd11a57dd9f59754cdacfd71bc564c8f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 4 Dec 2023 11:08:11 +0100
-Subject: [PATCH 02/34] net: mvmdio: Support setting the MDC frequency on XSMI
+Subject: [PATCH 02/36] net: mvmdio: Support setting the MDC frequency on XSMI
  controllers
-Organization: Addiva Elektronik
+Organization: Wires
 
 Support the standard "clock-frequency" attribute to set the generated
 MDC frequency. If not specified, the driver will leave the divisor
@@ -14,7 +14,6 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 Tested-by: Andrew Lunn <andrew@lunn.ch>
 Link: https://lore.kernel.org/r/20231204100811.2708884-4-tobias@waldekranz.com
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
  drivers/net/ethernet/marvell/mvmdio.c | 44 +++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)

patches/linux/6.6.52/0003-net-dsa-mv88e6xxx-Create-API-to-read-a-single-stat-c.patch

@@ -1,9 +1,9 @@
 From 50a2973e8a520a82e9f9ec15a1f69e059ce7a334 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:23 +0100
-Subject: [PATCH 03/34] net: dsa: mv88e6xxx: Create API to read a single stat
+Subject: [PATCH 03/36] net: dsa: mv88e6xxx: Create API to read a single stat
  counter
-Organization: Addiva Elektronik
+Organization: Wires
 
 This change contains no functional change. We simply push the hardware
 specific stats logic to a function reading a single counter, rather
@@ -16,7 +16,6 @@ Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 162 ++++++++++++++++++-------------
  drivers/net/dsa/mv88e6xxx/chip.h |  27 +++---

patches/linux/6.6.52/0004-net-dsa-mv88e6xxx-Give-each-hw-stat-an-ID.patch

@@ -1,8 +1,8 @@
 From 5916503e23e7f85796c1f927747e66b9535bac53 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:25 +0100
-Subject: [PATCH 04/34] net: dsa: mv88e6xxx: Give each hw stat an ID
-Organization: Addiva Elektronik
+Subject: [PATCH 04/36] net: dsa: mv88e6xxx: Give each hw stat an ID
+Organization: Wires
 
 With the upcoming standard counter group support, we are no longer
 reading out the whole set of counters, but rather mapping a subset to
@@ -16,7 +16,6 @@ Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 138 +++++++++++++++++--------------
  1 file changed, 75 insertions(+), 63 deletions(-)

patches/linux/6.6.52/0005-net-dsa-mv88e6xxx-Add-eth-mac-counter-group-support.patch

@@ -1,9 +1,9 @@
 From 32dda6562734ec8ee667bc546f3ef56794d5bf82 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:26 +0100
-Subject: [PATCH 05/34] net: dsa: mv88e6xxx: Add "eth-mac" counter group
+Subject: [PATCH 05/36] net: dsa: mv88e6xxx: Add "eth-mac" counter group
  support
-Organization: Addiva Elektronik
+Organization: Wires
 
 Report the applicable subset of an mv88e6xxx port's counters using
 ethtool's standardized "eth-mac" counter group.
@@ -12,7 +12,6 @@ Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 39 ++++++++++++++++++++++++++++++++
  1 file changed, 39 insertions(+)

patches/linux/6.6.52/0006-net-dsa-mv88e6xxx-Limit-histogram-counters-to-ingres.patch

@@ -1,9 +1,9 @@
 From 36adbdd466ec550cab8b2ae54177f674c02cf631 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:27 +0100
-Subject: [PATCH 06/34] net: dsa: mv88e6xxx: Limit histogram counters to
+Subject: [PATCH 06/36] net: dsa: mv88e6xxx: Limit histogram counters to
  ingress traffic
-Organization: Addiva Elektronik
+Organization: Wires
 
 Chips in this family only have one set of histogram counters, which
 can be used to count ingressing and/or egressing traffic. mv88e6xxx
@@ -27,7 +27,6 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c    | 6 +++---
  drivers/net/dsa/mv88e6xxx/global1.c | 7 +++----

patches/linux/6.6.52/0007-net-dsa-mv88e6xxx-Add-rmon-counter-group-support.patch

@@ -1,8 +1,8 @@
 From abfa532c1149525b128b8c76d80965f55e208240 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:28 +0100
-Subject: [PATCH 07/34] net: dsa: mv88e6xxx: Add "rmon" counter group support
-Organization: Addiva Elektronik
+Subject: [PATCH 07/36] net: dsa: mv88e6xxx: Add "rmon" counter group support
+Organization: Wires
 
 Report the applicable subset of an mv88e6xxx port's counters using
 ethtool's standardized "rmon" counter group.
@@ -11,7 +11,6 @@ Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 42 ++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)

patches/linux/6.6.52/0009-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch

@@ -1,13 +1,13 @@
 From 4407b94b4a08536fccb6eea2826955ff12d63ec2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 19:44:32 +0100
-Subject: [PATCH 09/34] net: dsa: mv88e6xxx: Add LED infrastructure
-Organization: Addiva Elektronik
+Subject: [PATCH 09/36] net: dsa: mv88e6xxx: Add LED infrastructure
+Organization: Wires
 
 Parse DT for LEDs and register them for devices that support it,
 though no actual implementations exist yet.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/Makefile |   1 +
  drivers/net/dsa/mv88e6xxx/chip.c   |   5 +-

patches/linux/6.6.52/0010-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch

@@ -1,15 +1,15 @@
 From a5cf5c0353db07e74d7a29dd4d5c2cb7775d5bec Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 21:59:35 +0100
-Subject: [PATCH 10/34] net: dsa: mv88e6xxx: Add LED support for 6393X
-Organization: Addiva Elektronik
+Subject: [PATCH 10/36] net: dsa: mv88e6xxx: Add LED support for 6393X
+Organization: Wires
 
 Trigger support:
 - "none"
 - "timer"
 - "netdev"
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c |   1 +
  drivers/net/dsa/mv88e6xxx/leds.c | 226 +++++++++++++++++++++++++++++++

patches/linux/6.6.52/0011-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU-on-.patch

@@ -1,15 +1,15 @@
 From be94ec851dbb8e55c3f5e82f197b2dc59566aea2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
-Subject: [PATCH 11/34] net: dsa: mv88e6xxx: Fix timeout on waiting for PPU on
+Subject: [PATCH 11/36] net: dsa: mv88e6xxx: Fix timeout on waiting for PPU on
  6393X
-Organization: Addiva Elektronik
+Organization: Wires
 
 In a multi-chip setup, delays of up to 750ms are observed before the
 device (6393X) signals completion of PPU initialization (Global 1,
 register 0, bit 15). Therefore, increase the timeout threshold to 1s.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

patches/linux/6.6.52/0012-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch

@@ -1,9 +1,9 @@
 From 69092f83541e6539ab82eec3052325c403675de4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
-Subject: [PATCH 12/34] net: dsa: Support MDB memberships whose L2 addresses
+Subject: [PATCH 12/36] net: dsa: Support MDB memberships whose L2 addresses
  overlap
-Organization: Addiva Elektronik
+Organization: Wires
 
 Multiple IP multicast groups (32 for v4, 2^80 for v6) map to the same
 L2 address. This means that switchdev drivers may receive multiple MDB
@@ -30,7 +30,7 @@ needed to do this is already in place, since it is also needed on CPU
 and DSA ports. Thus, "implement" this by simply removing the guards
 which previously skipped reference countung on user ports.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  net/dsa/switch.c | 16 ----------------
  1 file changed, 16 deletions(-)

patches/linux/6.6.52/0013-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

@@ -1,9 +1,9 @@
 From 7c19df77212d0728874515e97cf297863a6ff2cd Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
-Subject: [PATCH 13/34] net: phy: marvell10g: Support firmware loading on
+Subject: [PATCH 13/36] net: phy: marvell10g: Support firmware loading on
  88X3310
-Organization: Addiva Elektronik
+Organization: Wires
 
 When probing, if a device is waiting for firmware to be loaded into
 its RAM, ask userspace for the binary and load it over XMDIO.
@@ -12,7 +12,7 @@ We have no choice but to bail out of the probe if firmware is not
 available, as the device does not have any built-in image on which to
 fall back.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/phy/marvell10g.c | 161 +++++++++++++++++++++++++++++++++++
  1 file changed, 161 insertions(+)

patches/linux/6.6.52/0014-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch

@@ -1,15 +1,15 @@
 From 0c34b42b7a72ddf1af6f3534870d647801e493fa Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
-Subject: [PATCH 14/34] net: phy: marvell10g: Fix power-up when strapped to
+Subject: [PATCH 14/36] net: phy: marvell10g: Fix power-up when strapped to
  start powered down
-Organization: Addiva Elektronik
+Organization: Wires
 
 On devices which are hardware strapped to start powered down (PDSTATE
 == 1), make sure that we clear the power-down bit on all units
 affected by this setting.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/phy/marvell10g.c | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)

patches/linux/6.6.52/0015-net-phy-marvell10g-Add-LED-support-for-88X3310.patch

@@ -1,8 +1,8 @@
 From 6576918d3348f8e20802379d568d7632228af4d7 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
-Subject: [PATCH 15/34] net: phy: marvell10g: Add LED support for 88X3310
-Organization: Addiva Elektronik
+Subject: [PATCH 15/36] net: phy: marvell10g: Add LED support for 88X3310
+Organization: Wires
 
 Pickup the LEDs from the state in which the hardware reset or
 bootloader left them, but also support further configuration via
@@ -18,7 +18,7 @@ Trigger support:
 - "netdev": Offload link or duplex information to the solid behavior;
   	    tx and/or rx activity to blink behavior.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/phy/marvell10g.c | 422 +++++++++++++++++++++++++++++++++++
  1 file changed, 422 insertions(+)

patches/linux/6.6.52/0016-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch

@@ -1,9 +1,9 @@
 From 1ad7f010e46133c725df5cab4d85f71f689ca191 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
-Subject: [PATCH 16/34] net: phy: marvell10g: Support LEDs tied to a single
+Subject: [PATCH 16/36] net: phy: marvell10g: Support LEDs tied to a single
  media side
-Organization: Addiva Elektronik
+Organization: Wires
 
 In a combo-port setup, i.e. where both the copper and fiber interface
 are available to the user, the LEDs may be physically located either
@@ -15,7 +15,7 @@ the offloading of the "netdev" trigger, such that LEDs attached to the
 RJ45 jack only lights up when a copper link is established, and vice
 versa for the SFP cage.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/phy/marvell10g.c | 23 ++++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)

patches/linux/6.6.52/0017-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch

@@ -1,9 +1,9 @@
 From 11b9a3e328241edede03b6615bb9b0f1a40b9b7d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
-Subject: [PATCH 17/34] nvmem: layouts: onie-tlv: Let device probe even when
+Subject: [PATCH 17/36] nvmem: layouts: onie-tlv: Let device probe even when
  TLV is invalid
-Organization: Addiva Elektronik
+Organization: Wires
 
 Before this change, probing an NVMEM device, expected to contain a
 valid TLV, would fail if it had not been provisioned yet. But an
@@ -14,7 +14,7 @@ be successfully probed.
 Therefore, settle for reporting data corruption issues in the log, and
 simply refrain from registering any cells in those cases.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/nvmem/layouts/onie-tlv.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

patches/linux/6.6.52/0018-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch

@@ -1,9 +1,9 @@
 From ce1148b5c2e33541ad13ff2c4769d0b37d4e42b9 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
-Subject: [PATCH 18/34] net: bridge: avoid classifying unknown multicast as
+Subject: [PATCH 18/36] net: bridge: avoid classifying unknown multicast as
  mrouters_only
-Organization: Addiva Elektronik
+Organization: Wires
 
 Unknown multicast, MAC/IPv4/IPv6, should always be flooded according to
 the per-port mcast_flood setting, as well as to detected and configured
@@ -16,6 +16,7 @@ Because a multicast router should always receive both known and unknown
 multicast.
 
 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  include/uapi/linux/if_bridge.h |  1 +
  net/bridge/br.c                |  5 +++++

patches/linux/6.6.52/0019-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch

@@ -1,9 +1,9 @@
 From ce74ee8c5461cc53851ca323b4dfc9937cab0e41 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
-Subject: [PATCH 19/34] net: bridge: Ignore router ports when forwarding L2
+Subject: [PATCH 19/36] net: bridge: Ignore router ports when forwarding L2
  multicast
-Organization: Addiva Elektronik
+Organization: Wires
 
 Multicast router ports are either statically configured or learned from
 control protocol traffic (IGMP/MLD/PIM).  These protocols regulate IP

patches/linux/6.6.52/0020-net-dsa-Support-EtherType-based-priority-overrides.patch

@@ -1,10 +1,10 @@
 From 3c9b05198e0b7193f2dcddc1860cd77f0adbc3a2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
-Subject: [PATCH 20/34] net: dsa: Support EtherType based priority overrides
-Organization: Addiva Elektronik
+Subject: [PATCH 20/36] net: dsa: Support EtherType based priority overrides
+Organization: Wires
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  include/net/dsa.h |  4 ++++
  net/dsa/slave.c   | 56 +++++++++++++++++++++++++++++++++++++++++++++--

patches/linux/6.6.52/0021-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch

@@ -1,11 +1,11 @@
 From 333134a4ff2b8dd7fb00a75560254de96d1082ad Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
-Subject: [PATCH 21/34] net: dsa: mv88e6xxx: Support EtherType based priority
+Subject: [PATCH 21/36] net: dsa: mv88e6xxx: Support EtherType based priority
  overrides
-Organization: Addiva Elektronik
+Organization: Wires
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c    | 64 +++++++++++++++++++++++++++++
  drivers/net/dsa/mv88e6xxx/chip.h    | 21 ++++++++++

patches/linux/6.6.52/0022-net-phy-Do-not-resume-PHY-when-attaching.patch

@@ -1,8 +1,8 @@
 From cdddc24c05cedc0d0fabc48da17ec26aeb7c1ef9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
-Subject: [PATCH 22/34] net: phy: Do not resume PHY when attaching
-Organization: Addiva Elektronik
+Subject: [PATCH 22/36] net: phy: Do not resume PHY when attaching
+Organization: Wires
 
 The PHY should not start negotiating with its link-partner until
 explicitly instructed to do so.
@@ -16,7 +16,7 @@ probing (e.g. DSA) would end up with a physical link being
 established, even though the corresponding interface was still
 administratively down.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/phy/phy_device.c | 1 -
  1 file changed, 1 deletion(-)

patches/linux/6.6.52/0023-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch

@@ -1,9 +1,9 @@
 From 1ec21a3fc54fb447501fd7edbf692b00a31fe3ec Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
-Subject: [PATCH 23/34] net: dsa: mv88e6xxx: Improve indirect register access
+Subject: [PATCH 23/36] net: dsa: mv88e6xxx: Improve indirect register access
  perf on 6393
-Organization: Addiva Elektronik
+Organization: Wires
 
 When operating in multi-chip mode, the 6393 family maps a subset of
 commonly used global registers to the outermost address space (in
@@ -14,7 +14,7 @@ Therefore, add a new set of SMI operations which remaps accesses to
 such registers to the corresponding directly addressable register. All
 other accesses use the regular indirect interface.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c    |  7 +++
  drivers/net/dsa/mv88e6xxx/global1.h |  3 ++

patches/linux/6.6.52/0024-net-bridge-drop-delay-for-applying-strict-multicast-.patch

@@ -1,9 +1,9 @@
 From 5d7be493dcaa75ee69d521043062389d7772f8dc Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
-Subject: [PATCH 24/34] net: bridge: drop delay for applying strict multicast
+Subject: [PATCH 24/36] net: bridge: drop delay for applying strict multicast
  filtering
-Organization: Addiva Elektronik
+Organization: Wires
 
 This *local* patch drops the initial delay before applying strict multicast
 filtering, introduced in [1] and recently updated in [2].
@@ -19,6 +19,7 @@ A proper fix for upstreaming could be to add a knob to disable the delay.
 [2]: https://lore.kernel.org/netdev/20240127175033.9640-1-linus.luessing@c0d3.blue/
 
 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  net/bridge/br_multicast.c | 42 +++++++--------------------------------
  net/bridge/br_private.h   |  4 +---

patches/linux/6.6.52/0025-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch

@@ -1,9 +1,9 @@
 From 492a824661dbc188b5abeb7434b5cf67c2016415 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
-Subject: [PATCH 25/34] net: dsa: mv88e6xxx: Honor ports being managed via
+Subject: [PATCH 25/36] net: dsa: mv88e6xxx: Honor ports being managed via
  in-band-status
-Organization: Addiva Elektronik
+Organization: Wires
 
 Keep all link parameters in their unforced states when the port is
 declared as being managed via in-band-status, and let the MAC
@@ -14,7 +14,7 @@ This state is the default set up by mv88e6xxx_port_setup_mac(), so all
 we have to do is to make the phylink MAC callbacks no-ops in cases
 when in-band-status is being used.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++
  1 file changed, 6 insertions(+)

patches/linux/6.6.52/0026-net-dsa-mv88e6xxx-Fix-port-policy-config-on-6393X.patch

@@ -1,8 +1,8 @@
 From c9c9597a47b00b720f5223c83ab05bb89481eda8 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 21:35:26 +0200
-Subject: [PATCH 26/34] net: dsa: mv88e6xxx: Fix port policy config on 6393X
-Organization: Addiva Elektronik
+Subject: [PATCH 26/36] net: dsa: mv88e6xxx: Fix port policy config on 6393X
+Organization: Wires
 
 mv88e6393x_port_policy_{read,write} expect the `pointer` argument to
 be "pre-shifted" 8 bits.
@@ -16,7 +16,7 @@ never enabled on DSA ports, which broke standalone port isolation in
 multichip switch trees made up of 6393X decices.
 
 Fixes: 6584b26020fc ("net: dsa: mv88e6xxx: implement .port_set_policy for Amethyst")
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/port.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

patches/linux/6.6.52/0027-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch

@@ -1,9 +1,9 @@
 From 4ff224b5f5de1347a1f686aa85cb918a7db18879 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
-Subject: [PATCH 27/34] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
+Subject: [PATCH 27/36] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
  ports on 6393X
-Organization: Addiva Elektronik
+Organization: Wires
 
 For packets with a DA in the IEEE reserved L2 group range, originating
 from a CPU, forward it as normal, rather than classifying it as
@@ -30,7 +30,7 @@ switch would try to trap it back to the CPU. Given that the CPU is
 trusted, instead assume that it indeed meant for the packet to be
 forwarded like any other.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/port.c | 31 +++++++++++++++++++++++++------
  1 file changed, 25 insertions(+), 6 deletions(-)

patches/linux/6.6.52/0028-usb-core-adjust-log-level-for-unauthorized-devices.patch

@@ -1,14 +1,15 @@
 From f0d4beabe769fec594b309c3f1ebb79cfdbede8b Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 29 Apr 2024 15:14:51 +0200
-Subject: [PATCH 28/34] usb: core: adjust log level for unauthorized devices
-Organization: Addiva Elektronik
+Subject: [PATCH 28/36] usb: core: adjust log level for unauthorized devices
+Organization: Wires
 
 The fact that a USB device currently is not authorized is not an error,
 so let's adjust the log level so these messages slip below radar for the
 commonly used 'quiet' log level.
 
 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/usb/core/driver.c  | 4 ++--
  drivers/usb/core/generic.c | 2 +-

patches/linux/6.6.52/0029-net-dsa-mv88e6xxx-Grab-register-lock-during-counter-.patch

@@ -1,16 +1,16 @@
 From 5f96d718c850084504c53ec0b8d9fcf75ea9996c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 May 2024 13:50:58 +0200
-Subject: [PATCH 29/34] net: dsa: mv88e6xxx: Grab register lock during counter
+Subject: [PATCH 29/36] net: dsa: mv88e6xxx: Grab register lock during counter
  snapshotting
-Organization: Addiva Elektronik
+Organization: Wires
 
 This was missing for the standard counter groups. Since no caller
 already holds the lock, opt for pushing the locking down into
 mv88e6xxx_stats_snapshot() rather than having it duplicated at each
 call site.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

patches/linux/6.6.52/0030-net-bridge-Differentiate-MDB-additions-from-modifica.patch

@@ -1,9 +1,9 @@
 From 6d4c436335003259cc02a0f015fd3d1d54e988a2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
-Subject: [PATCH 30/34] net: bridge: Differentiate MDB additions from
+Subject: [PATCH 30/36] net: bridge: Differentiate MDB additions from
  modifications
-Organization: Addiva Elektronik
+Organization: Wires
 
 Before this change, the reception of an IGMPv3 report (and analogously
 for MLDv2) that adds a new group, would trigger two MDB RTM_NEWMDB
@@ -22,7 +22,7 @@ generated.
 Therefore, discriminate new groups from changes to existing groups by
 introducing a RTM_SETMDB events to be used in the latter scenario.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  include/uapi/linux/rtnetlink.h | 2 ++
  net/bridge/br_mdb.c            | 4 ++--

patches/linux/6.6.52/0031-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch

@@ -1,9 +1,9 @@
 From c333c612688d5e974b95fcf4b04f185d7cf4f80d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
-Subject: [PATCH 31/34] net: dsa: tag_dsa: Use tag priority as initial
+Subject: [PATCH 31/36] net: dsa: tag_dsa: Use tag priority as initial
  skb->priority
-Organization: Addiva Elektronik
+Organization: Wires
 
 Use the 3-bit priority field from the DSA tag as the initial packet
 priority on ingress to the CPU.
@@ -20,7 +20,7 @@ can do with an "ingress-qos-map" on VLAN interfaces. Until that is
 implemented, support the setup that is likely to be the most common; a
 1:1 mapping from FPri to skb->priority.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  net/dsa/tag_dsa.c | 7 +++++++
  1 file changed, 7 insertions(+)

patches/linux/6.6.52/0032-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch

@@ -1,8 +1,8 @@
 From 18c025745fd8b8c9b3e688e9d78668a56cf71217 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
-Subject: [PATCH 32/34] net: dsa: mv88e6xxx: Add mqprio qdisc support
-Organization: Addiva Elektronik
+Subject: [PATCH 32/36] net: dsa: mv88e6xxx: Add mqprio qdisc support
+Organization: Wires
 
 Add support for attaching mqprio qdisc's to mv88e6xxx ports and use
 the packet's traffic class as the outgoing priority when no PCP bits
@@ -25,7 +25,7 @@ Since FPri is always a 3-bit field, even on older chips with only 4
 physical queues, always report 8 queues and let the chip's policy
 handle the mapping down to the "real" number.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 70 ++++++++++++++++++++++++++++++++
  net/dsa/tag_dsa.c                |  4 +-

patches/linux/6.6.52/0033-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch

@@ -1,9 +1,9 @@
 From f2d4ff12c7a0e644cbeac6675b755fb4a87b362a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
-Subject: [PATCH 33/34] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
+Subject: [PATCH 33/36] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
  are available
-Organization: Addiva Elektronik
+Organization: Wires
 
 Switch the priority sourcing precdence to prefer VLAN PCP over IP
 DSCP, when both are available.
@@ -23,7 +23,7 @@ main reasons for choosing the new default:
    core over trusted VLAN trunks, the packet should keep its original
    priority, independent of what inner protocol fields may indicate.
 
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/chip.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)

patches/linux/6.6.52/0034-net-dsa-mb88e6xxx-use-EOPNOTSUPP-for-unsupported-fla.patch

@@ -1,9 +1,9 @@
 From ceaaa4f44f9b3ec82c4e0a24c2322aae58fa3aa0 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Wed, 6 Nov 2024 15:39:33 +0100
-Subject: [PATCH 34/34] net: dsa: mb88e6xxx: use EOPNOTSUPP for unsupported
+Subject: [PATCH 34/36] net: dsa: mb88e6xxx: use EOPNOTSUPP for unsupported
  flags
-Organization: Addiva Elektronik
+Organization: Wires
 
 Make sure to return correct error code for unsupported flags, and
 propagate any error.
@@ -11,6 +11,7 @@ propagate any error.
 Follow-up to a5cf5c0
 
 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
  drivers/net/dsa/mv88e6xxx/leds.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)

patches/linux/6.6.52/0035-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch

@@ -0,0 +1,160 @@
+From ab93e65511ee508d1b637e4ad0dc6dcddd2c48dc Mon Sep 17 00:00:00 2001
+From: Tobias Waldekranz <tobias@waldekranz.com>
+Date: Tue, 26 Nov 2024 19:45:59 +0100
+Subject: [PATCH 35/36] net: dsa: mv88e6xxx: Trap locally terminated VLANs
+Organization: Wires
+
+Before this change, in a setup like the following, packets assigned to
+VLAN 10 were forwarded between the switch ports, even though the
+configuration dictates that they should only be locally terminated.
+
+ip link add dev br0 up type bridge vlan_filtering 1
+ip link set dev swp1 master br0
+ip link set dev swp2 master br0
+ip link add dev swp1.10 link swp1 up type vlan id 10
+ip link add dev swp2.10 link swp2 up type vlan id 10
+
+swp1.10  br0  swp2.10
+      \ /   \ /
+      swp1  swp2
+
+Therefore, make sure that VLANs that are added to the VTU to terminate
+a VLAN upper interface, rather than to offload bridge VLANs, are
+marked as policy entries. As the VTU policy of user ports is already
+set to TRAP (to ensure proper standalone port operation), this will
+cause all packets assigned to these VLANs to properly terminated.
+
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
+---
+ drivers/net/dsa/mv88e6xxx/chip.c | 33 ++++++++++++++++++--------------
+ include/net/switchdev.h          |  4 ++++
+ net/dsa/slave.c                  |  4 ++++
+ 3 files changed, 27 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
+index 305abb33b0c6..259eec1a3a1d 100644
+--- a/drivers/net/dsa/mv88e6xxx/chip.c
++++ b/drivers/net/dsa/mv88e6xxx/chip.c
+@@ -2610,7 +2610,7 @@ static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port,
+ }
+ 
+ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,
+-				    u16 vid, u8 member, bool warn)
++				    u16 vid, u8 member, bool warn, bool policy)
+ {
+ 	const u8 non_member = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER;
+ 	struct mv88e6xxx_vtu_entry vlan;
+@@ -2622,9 +2622,7 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,
+ 
+ 	if (!vlan.valid) {
+ 		memset(&vlan, 0, sizeof(vlan));
+-
+-		if (vid == MV88E6XXX_VID_STANDALONE)
+-			vlan.policy = true;
++		vlan.policy = policy;
+ 
+ 		err = mv88e6xxx_atu_new(chip, &vlan.fid);
+ 		if (err)
+@@ -2647,6 +2645,9 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,
+ 		if (err)
+ 			return err;
+ 	} else if (vlan.member[port] != member) {
++		if (vlan.policy != policy)
++			return -EBUSY;
++
+ 		vlan.member[port] = member;
+ 
+ 		err = mv88e6xxx_vtu_loadpurge(chip, &vlan);
+@@ -2693,7 +2694,8 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,
+ 
+ 	mv88e6xxx_reg_lock(chip);
+ 
+-	err = mv88e6xxx_port_vlan_join(chip, port, vlan->vid, member, warn);
++	err = mv88e6xxx_port_vlan_join(chip, port, vlan->vid, member, warn,
++				       vlan->from_upper);
+ 	if (err) {
+ 		dev_err(ds->dev, "p%d: failed to add VLAN %d%c\n", port,
+ 			vlan->vid, untagged ? 'u' : 't');
+@@ -3433,14 +3435,17 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+ 	if (err)
+ 		return err;
+ 
+-	/* On chips that support it, set all downstream DSA ports'
+-	 * VLAN policy to TRAP. In combination with loading
+-	 * MV88E6XXX_VID_STANDALONE as a policy entry in the VTU, this
+-	 * provides a better isolation barrier between standalone
+-	 * ports, as the ATU is bypassed on any intermediate switches
+-	 * between the incoming port and the CPU.
++	/* On chips that support it, set all downstream DSA and user
++	 * ports' VLAN policy to TRAP. for downstream DSA ports, in
++	 * combination with loading MV88E6XXX_VID_STANDALONE as a
++	 * policy entry in the VTU, this provides a better isolation
++	 * barrier between standalone ports, as the ATU is bypassed on
++	 * any intermediate switches between the incoming port and the
++	 * CPU. On user ports we need it to support stacked VLAN
++	 * uppers on ports that are simultaneously attached to a VLAN
++	 * filtering bridge.
+ 	 */
+-	if (dsa_is_downstream_port(ds, port) &&
++	if ((dsa_is_downstream_port(ds, port) || dsa_is_user_port(ds, port)) &&
+ 	    chip->info->ops->port_set_policy) {
+ 		err = chip->info->ops->port_set_policy(chip, port,
+ 						MV88E6XXX_POLICY_MAPPING_VTU,
+@@ -3470,7 +3475,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+ 	 */
+ 	err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_STANDALONE,
+ 				       MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED,
+-				       false);
++				       false, true);
+ 	if (err)
+ 		return err;
+ 
+@@ -3484,7 +3489,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+ 	 */
+ 	err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_BRIDGED,
+ 				       MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED,
+-				       false);
++				       false, false);
+ 	if (err)
+ 		return err;
+ 
+diff --git a/include/net/switchdev.h b/include/net/switchdev.h
+index 8346b0d29542..764cd3dd4645 100644
+--- a/include/net/switchdev.h
++++ b/include/net/switchdev.h
+@@ -104,6 +104,10 @@ struct switchdev_obj_port_vlan {
+ 	 * Entries with BRIDGE_VLAN_INFO_BRENTRY unset are not notified at all.
+ 	 */
+ 	bool changed;
++
++	/* If set, this VLAN object stems from an upper interface
++	 * being stacked on/removed from the original device. */
++	bool from_upper;
+ };
+ 
+ #define SWITCHDEV_OBJ_PORT_VLAN(OBJ) \
+diff --git a/net/dsa/slave.c b/net/dsa/slave.c
+index 18d913bcd180..b45c2ac1f1f0 100644
+--- a/net/dsa/slave.c
++++ b/net/dsa/slave.c
+@@ -1762,6 +1762,8 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
+ 		.vid = vid,
+ 		/* This API only allows programming tagged, non-PVID VIDs */
+ 		.flags = 0,
++
++		.from_upper = true,
+ 	};
+ 	struct netlink_ext_ack extack = {0};
+ 	struct dsa_switch *ds = dp->ds;
+@@ -1836,6 +1838,8 @@ static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
+ 		.vid = vid,
+ 		/* This API only allows programming tagged, non-PVID VIDs */
+ 		.flags = 0,
++
++		.from_upper = true,
+ 	};
+ 	struct dsa_switch *ds = dp->ds;
+ 	struct netdev_hw_addr *ha;
+-- 
+2.43.0
+

patches/linux/6.6.52/0036-net-mvpp2-Prevent-parser-TCAM-memory-corruption.patch

@@ -0,0 +1,575 @@
+From 1527d6234666b2d275edaa9662f222214e030c41 Mon Sep 17 00:00:00 2001
+From: Tobias Waldekranz <tobias@waldekranz.com>
+Date: Tue, 18 Mar 2025 10:55:09 +0100
+Subject: [PATCH 36/36] net: mvpp2: Prevent parser TCAM memory corruption
+Organization: Wires
+
+Protect the parser TCAM/SRAM memory, and the cached (shadow) SRAM
+information, from concurrent modifications.
+
+Both the TCAM and SRAM tables are indirectly accessed by configuring
+an index register that selects the row to read or write to. This means
+that operations must be atomic in order to, e.g., avoid spreading
+writes across multiple rows. Since the shadow SRAM array is used to
+find free rows in the hardware table, it must also be protected in
+order to avoid TOCTOU errors where multiple cores allocate the same
+row.
+
+This issue was detected in a situation where `mvpp2_set_rx_mode()` ran
+concurrently on two CPUs. In this particular case the
+MVPP2_PE_MAC_UC_PROMISCUOUS entry was corrupted, causing the
+classifier unit to drop all incoming unicast - indicated by the
+`rx_classifier_drops` counter.
+
+Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit")
+Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
+---
+ drivers/net/ethernet/marvell/mvpp2/mvpp2.h    |   3 +-
+ .../net/ethernet/marvell/mvpp2/mvpp2_main.c   |   3 +-
+ .../net/ethernet/marvell/mvpp2/mvpp2_prs.c    | 146 ++++++++++++++----
+ 3 files changed, 118 insertions(+), 34 deletions(-)
+
+diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+index e809f91c08fb..d980b8799d95 100644
+--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
++++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+@@ -1106,8 +1106,9 @@ struct mvpp2 {
+ 	/* Global TX Flow Control config */
+ 	bool global_tx_fc;
+ 
+-	/* Spinlocks for CM3 shared memory configuration */
++	/* Spinlocks for shared packet processor functional units */
+ 	spinlock_t mss_spinlock;
++	spinlock_t prs_spinlock;
+ };
+ 
+ struct mvpp2_pcpu_stats {
+diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+index 34051c9abd97..0e69faedbf97 100644
+--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
++++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+@@ -7615,8 +7615,9 @@ static int mvpp2_probe(struct platform_device *pdev)
+ 	if (mvpp2_read(priv, MVPP2_VER_ID_REG) == MVPP2_VER_PP23)
+ 		priv->hw_version = MVPP23;
+ 
+-	/* Init mss lock */
++	/* Init shared packet processor functional unit locks */
+ 	spin_lock_init(&priv->mss_spinlock);
++	spin_lock_init(&priv->prs_spinlock);
+ 
+ 	/* Initialize network controller */
+ 	err = mvpp2_init(pdev, priv);
+diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
+index 9af22f497a40..aa834153d99f 100644
+--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
++++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
+@@ -43,8 +43,8 @@ static int mvpp2_prs_hw_write(struct mvpp2 *priv, struct mvpp2_prs_entry *pe)
+ }
+ 
+ /* Initialize tcam entry from hw */
+-int mvpp2_prs_init_from_hw(struct mvpp2 *priv, struct mvpp2_prs_entry *pe,
+-			   int tid)
++static int mvpp2_prs_init_from_hw_unlocked(struct mvpp2 *priv,
++					   struct mvpp2_prs_entry *pe, int tid)
+ {
+ 	int i;
+ 
+@@ -73,6 +73,19 @@ int mvpp2_prs_init_from_hw(struct mvpp2 *priv, struct mvpp2_prs_entry *pe,
+ 	return 0;
+ }
+ 
++int mvpp2_prs_init_from_hw(struct mvpp2 *priv, struct mvpp2_prs_entry *pe,
++			   int tid)
++{
++	unsigned long flags;
++	int err;
++
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
++	err = mvpp2_prs_init_from_hw_unlocked(priv, pe, tid);
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
++
++	return err;
++}
++
+ /* Invalidate tcam hw entry */
+ static void mvpp2_prs_hw_inv(struct mvpp2 *priv, int index)
+ {
+@@ -374,7 +387,7 @@ static int mvpp2_prs_flow_find(struct mvpp2 *priv, int flow)
+ 		    priv->prs_shadow[tid].lu != MVPP2_PRS_LU_FLOWS)
+ 			continue;
+ 
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 		bits = mvpp2_prs_sram_ai_get(&pe);
+ 
+ 		/* Sram store classification lookup ID in AI bits [5:0] */
+@@ -441,7 +454,7 @@ static void mvpp2_prs_mac_drop_all_set(struct mvpp2 *priv, int port, bool add)
+ 
+ 	if (priv->prs_shadow[MVPP2_PE_DROP_ALL].valid) {
+ 		/* Entry exist - update port only */
+-		mvpp2_prs_init_from_hw(priv, &pe, MVPP2_PE_DROP_ALL);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, MVPP2_PE_DROP_ALL);
+ 	} else {
+ 		/* Entry doesn't exist - create new */
+ 		memset(&pe, 0, sizeof(pe));
+@@ -474,9 +487,12 @@ void mvpp2_prs_mac_promisc_set(struct mvpp2 *priv, int port,
+ {
+ 	struct mvpp2_prs_entry pe;
+ 	unsigned char cast_match;
++	unsigned long flags;
+ 	unsigned int ri;
+ 	int tid;
+ 
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
++
+ 	if (l2_cast == MVPP2_PRS_L2_UNI_CAST) {
+ 		cast_match = MVPP2_PRS_UCAST_VAL;
+ 		tid = MVPP2_PE_MAC_UC_PROMISCUOUS;
+@@ -489,7 +505,7 @@ void mvpp2_prs_mac_promisc_set(struct mvpp2 *priv, int port,
+ 
+ 	/* promiscuous mode - Accept unknown unicast or multicast packets */
+ 	if (priv->prs_shadow[tid].valid) {
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 	} else {
+ 		memset(&pe, 0, sizeof(pe));
+ 		mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_MAC);
+@@ -520,6 +536,8 @@ void mvpp2_prs_mac_promisc_set(struct mvpp2 *priv, int port,
+ 	mvpp2_prs_tcam_port_set(&pe, port, add);
+ 
+ 	mvpp2_prs_hw_write(priv, &pe);
++
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ }
+ 
+ /* Set entry for dsa packets */
+@@ -539,7 +557,7 @@ static void mvpp2_prs_dsa_tag_set(struct mvpp2 *priv, int port, bool add,
+ 
+ 	if (priv->prs_shadow[tid].valid) {
+ 		/* Entry exist - update port only */
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 	} else {
+ 		/* Entry doesn't exist - create new */
+ 		memset(&pe, 0, sizeof(pe));
+@@ -610,7 +628,7 @@ static void mvpp2_prs_dsa_tag_ethertype_set(struct mvpp2 *priv, int port,
+ 
+ 	if (priv->prs_shadow[tid].valid) {
+ 		/* Entry exist - update port only */
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 	} else {
+ 		/* Entry doesn't exist - create new */
+ 		memset(&pe, 0, sizeof(pe));
+@@ -673,7 +691,7 @@ static int mvpp2_prs_vlan_find(struct mvpp2 *priv, unsigned short tpid, int ai)
+ 		    priv->prs_shadow[tid].lu != MVPP2_PRS_LU_VLAN)
+ 			continue;
+ 
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 		match = mvpp2_prs_tcam_data_cmp(&pe, 0, tpid);
+ 		if (!match)
+ 			continue;
+@@ -726,7 +744,7 @@ static int mvpp2_prs_vlan_add(struct mvpp2 *priv, unsigned short tpid, int ai,
+ 			    priv->prs_shadow[tid_aux].lu != MVPP2_PRS_LU_VLAN)
+ 				continue;
+ 
+-			mvpp2_prs_init_from_hw(priv, &pe, tid_aux);
++			mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid_aux);
+ 			ri_bits = mvpp2_prs_sram_ri_get(&pe);
+ 			if ((ri_bits & MVPP2_PRS_RI_VLAN_MASK) ==
+ 			    MVPP2_PRS_RI_VLAN_DOUBLE)
+@@ -760,7 +778,7 @@ static int mvpp2_prs_vlan_add(struct mvpp2 *priv, unsigned short tpid, int ai,
+ 
+ 		mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_VLAN);
+ 	} else {
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 	}
+ 	/* Update ports' mask */
+ 	mvpp2_prs_tcam_port_map_set(&pe, port_map);
+@@ -800,7 +818,7 @@ static int mvpp2_prs_double_vlan_find(struct mvpp2 *priv, unsigned short tpid1,
+ 		    priv->prs_shadow[tid].lu != MVPP2_PRS_LU_VLAN)
+ 			continue;
+ 
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 
+ 		match = mvpp2_prs_tcam_data_cmp(&pe, 0, tpid1) &&
+ 			mvpp2_prs_tcam_data_cmp(&pe, 4, tpid2);
+@@ -849,7 +867,7 @@ static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1,
+ 			    priv->prs_shadow[tid_aux].lu != MVPP2_PRS_LU_VLAN)
+ 				continue;
+ 
+-			mvpp2_prs_init_from_hw(priv, &pe, tid_aux);
++			mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid_aux);
+ 			ri_bits = mvpp2_prs_sram_ri_get(&pe);
+ 			ri_bits &= MVPP2_PRS_RI_VLAN_MASK;
+ 			if (ri_bits == MVPP2_PRS_RI_VLAN_SINGLE ||
+@@ -880,7 +898,7 @@ static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1,
+ 
+ 		mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_VLAN);
+ 	} else {
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 	}
+ 
+ 	/* Update ports' mask */
+@@ -1941,7 +1959,7 @@ static int mvpp2_prs_vid_range_find(struct mvpp2_port *port, u16 vid, u16 mask)
+ 		    port->priv->prs_shadow[tid].lu != MVPP2_PRS_LU_VID)
+ 			continue;
+ 
+-		mvpp2_prs_init_from_hw(port->priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(port->priv, &pe, tid);
+ 
+ 		mvpp2_prs_tcam_data_byte_get(&pe, 2, &byte[0], &enable[0]);
+ 		mvpp2_prs_tcam_data_byte_get(&pe, 3, &byte[1], &enable[1]);
+@@ -1966,10 +1984,13 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
+ 	unsigned int mask = 0xfff, reg_val, shift;
+ 	struct mvpp2 *priv = port->priv;
+ 	struct mvpp2_prs_entry pe;
++	unsigned long flags;
+ 	int tid;
+ 
+ 	memset(&pe, 0, sizeof(pe));
+ 
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
++
+ 	/* Scan TCAM and see if entry with this <vid,port> already exist */
+ 	tid = mvpp2_prs_vid_range_find(port, vid, mask);
+ 
+@@ -1988,8 +2009,10 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
+ 						MVPP2_PRS_VLAN_FILT_MAX_ENTRY);
+ 
+ 		/* There isn't room for a new VID filter */
+-		if (tid < 0)
++		if (tid < 0) {
++			spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ 			return tid;
++		}
+ 
+ 		mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_VID);
+ 		pe.index = tid;
+@@ -1997,7 +2020,7 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
+ 		/* Mask all ports */
+ 		mvpp2_prs_tcam_port_map_set(&pe, 0);
+ 	} else {
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 	}
+ 
+ 	/* Enable the current port */
+@@ -2019,6 +2042,7 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
+ 	mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_VID);
+ 	mvpp2_prs_hw_write(priv, &pe);
+ 
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ 	return 0;
+ }
+ 
+@@ -2026,25 +2050,30 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
+ void mvpp2_prs_vid_entry_remove(struct mvpp2_port *port, u16 vid)
+ {
+ 	struct mvpp2 *priv = port->priv;
++	unsigned long flags;
+ 	int tid;
+ 
+-	/* Scan TCAM and see if entry with this <vid,port> already exist */
+-	tid = mvpp2_prs_vid_range_find(port, vid, 0xfff);
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
+ 
+-	/* No such entry */
+-	if (tid < 0)
+-		return;
++	/* Invalidate TCAM entry with this <vid,port>, if it exists */
++	tid = mvpp2_prs_vid_range_find(port, vid, 0xfff);
++	if (tid >= 0) {
++		mvpp2_prs_hw_inv(priv, tid);
++		priv->prs_shadow[tid].valid = false;
++	}
+ 
+-	mvpp2_prs_hw_inv(priv, tid);
+-	priv->prs_shadow[tid].valid = false;
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ }
+ 
+ /* Remove all existing VID filters on this port */
+ void mvpp2_prs_vid_remove_all(struct mvpp2_port *port)
+ {
+ 	struct mvpp2 *priv = port->priv;
++	unsigned long flags;
+ 	int tid;
+ 
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
++
+ 	for (tid = MVPP2_PRS_VID_PORT_FIRST(port->id);
+ 	     tid <= MVPP2_PRS_VID_PORT_LAST(port->id); tid++) {
+ 		if (priv->prs_shadow[tid].valid) {
+@@ -2052,6 +2081,8 @@ void mvpp2_prs_vid_remove_all(struct mvpp2_port *port)
+ 			priv->prs_shadow[tid].valid = false;
+ 		}
+ 	}
++
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ }
+ 
+ /* Remove VID filering entry for this port */
+@@ -2059,11 +2090,16 @@ void mvpp2_prs_vid_disable_filtering(struct mvpp2_port *port)
+ {
+ 	unsigned int tid = MVPP2_PRS_VID_PORT_DFLT(port->id);
+ 	struct mvpp2 *priv = port->priv;
++	unsigned long flags;
++
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
+ 
+ 	/* Invalidate the guard entry */
+ 	mvpp2_prs_hw_inv(priv, tid);
+ 
+ 	priv->prs_shadow[tid].valid = false;
++
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ }
+ 
+ /* Add guard entry that drops packets when no VID is matched on this port */
+@@ -2073,12 +2109,15 @@ void mvpp2_prs_vid_enable_filtering(struct mvpp2_port *port)
+ 	struct mvpp2 *priv = port->priv;
+ 	unsigned int reg_val, shift;
+ 	struct mvpp2_prs_entry pe;
++	unsigned long flags;
+ 
+ 	if (priv->prs_shadow[tid].valid)
+ 		return;
+ 
+ 	memset(&pe, 0, sizeof(pe));
+ 
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
++
+ 	pe.index = tid;
+ 
+ 	reg_val = mvpp2_read(priv, MVPP2_MH_REG(port->id));
+@@ -2111,6 +2150,8 @@ void mvpp2_prs_vid_enable_filtering(struct mvpp2_port *port)
+ 	/* Update shadow table */
+ 	mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_VID);
+ 	mvpp2_prs_hw_write(priv, &pe);
++
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ }
+ 
+ /* Parser default initialization */
+@@ -2217,7 +2258,7 @@ mvpp2_prs_mac_da_range_find(struct mvpp2 *priv, int pmap, const u8 *da,
+ 		    (priv->prs_shadow[tid].udf != udf_type))
+ 			continue;
+ 
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 		entry_pmap = mvpp2_prs_tcam_port_map_get(&pe);
+ 
+ 		if (mvpp2_prs_mac_range_equals(&pe, da, mask) &&
+@@ -2229,7 +2270,8 @@ mvpp2_prs_mac_da_range_find(struct mvpp2 *priv, int pmap, const u8 *da,
+ }
+ 
+ /* Update parser's mac da entry */
+-int mvpp2_prs_mac_da_accept(struct mvpp2_port *port, const u8 *da, bool add)
++static int mvpp2_prs_mac_da_accept_unlocked(struct mvpp2_port *port,
++					    const u8 *da, bool add)
+ {
+ 	unsigned char mask[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+ 	struct mvpp2 *priv = port->priv;
+@@ -2261,7 +2303,7 @@ int mvpp2_prs_mac_da_accept(struct mvpp2_port *port, const u8 *da, bool add)
+ 		/* Mask all ports */
+ 		mvpp2_prs_tcam_port_map_set(&pe, 0);
+ 	} else {
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 	}
+ 
+ 	mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_MAC);
+@@ -2317,6 +2359,18 @@ int mvpp2_prs_mac_da_accept(struct mvpp2_port *port, const u8 *da, bool add)
+ 	return 0;
+ }
+ 
++int mvpp2_prs_mac_da_accept(struct mvpp2_port *port, const u8 *da, bool add)
++{
++	unsigned long flags;
++	int err;
++
++	spin_lock_irqsave(&port->priv->prs_spinlock, flags);
++	err = mvpp2_prs_mac_da_accept_unlocked(port, da, add);
++	spin_unlock_irqrestore(&port->priv->prs_spinlock, flags);
++
++	return err;
++}
++
+ int mvpp2_prs_update_mac_da(struct net_device *dev, const u8 *da)
+ {
+ 	struct mvpp2_port *port = netdev_priv(dev);
+@@ -2342,9 +2396,11 @@ void mvpp2_prs_mac_del_all(struct mvpp2_port *port)
+ {
+ 	struct mvpp2 *priv = port->priv;
+ 	struct mvpp2_prs_entry pe;
+-	unsigned long pmap;
++	unsigned long flags, pmap;
+ 	int index, tid;
+ 
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
++
+ 	for (tid = MVPP2_PE_MAC_RANGE_START;
+ 	     tid <= MVPP2_PE_MAC_RANGE_END; tid++) {
+ 		unsigned char da[ETH_ALEN], da_mask[ETH_ALEN];
+@@ -2354,7 +2410,7 @@ void mvpp2_prs_mac_del_all(struct mvpp2_port *port)
+ 		    (priv->prs_shadow[tid].udf != MVPP2_PRS_UDF_MAC_DEF))
+ 			continue;
+ 
+-		mvpp2_prs_init_from_hw(priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
+ 
+ 		pmap = mvpp2_prs_tcam_port_map_get(&pe);
+ 
+@@ -2375,14 +2431,19 @@ void mvpp2_prs_mac_del_all(struct mvpp2_port *port)
+ 			continue;
+ 
+ 		/* Remove entry from TCAM */
+-		mvpp2_prs_mac_da_accept(port, da, false);
++		mvpp2_prs_mac_da_accept_unlocked(port, da, false);
+ 	}
++
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ }
+ 
+ int mvpp2_prs_tag_mode_set(struct mvpp2 *priv, int port, int type)
+ {
++	unsigned long flags;
++
+ 	switch (type) {
+ 	case MVPP2_TAG_TYPE_EDSA:
++		spin_lock_irqsave(&priv->prs_spinlock, flags);
+ 		/* Add port to EDSA entries */
+ 		mvpp2_prs_dsa_tag_set(priv, port, true,
+ 				      MVPP2_PRS_TAGGED, MVPP2_PRS_EDSA);
+@@ -2393,9 +2454,11 @@ int mvpp2_prs_tag_mode_set(struct mvpp2 *priv, int port, int type)
+ 				      MVPP2_PRS_TAGGED, MVPP2_PRS_DSA);
+ 		mvpp2_prs_dsa_tag_set(priv, port, false,
+ 				      MVPP2_PRS_UNTAGGED, MVPP2_PRS_DSA);
++		spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ 		break;
+ 
+ 	case MVPP2_TAG_TYPE_DSA:
++		spin_lock_irqsave(&priv->prs_spinlock, flags);
+ 		/* Add port to DSA entries */
+ 		mvpp2_prs_dsa_tag_set(priv, port, true,
+ 				      MVPP2_PRS_TAGGED, MVPP2_PRS_DSA);
+@@ -2406,10 +2469,12 @@ int mvpp2_prs_tag_mode_set(struct mvpp2 *priv, int port, int type)
+ 				      MVPP2_PRS_TAGGED, MVPP2_PRS_EDSA);
+ 		mvpp2_prs_dsa_tag_set(priv, port, false,
+ 				      MVPP2_PRS_UNTAGGED, MVPP2_PRS_EDSA);
++		spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ 		break;
+ 
+ 	case MVPP2_TAG_TYPE_MH:
+ 	case MVPP2_TAG_TYPE_NONE:
++		spin_lock_irqsave(&priv->prs_spinlock, flags);
+ 		/* Remove port form EDSA and DSA entries */
+ 		mvpp2_prs_dsa_tag_set(priv, port, false,
+ 				      MVPP2_PRS_TAGGED, MVPP2_PRS_DSA);
+@@ -2419,6 +2484,7 @@ int mvpp2_prs_tag_mode_set(struct mvpp2 *priv, int port, int type)
+ 				      MVPP2_PRS_TAGGED, MVPP2_PRS_EDSA);
+ 		mvpp2_prs_dsa_tag_set(priv, port, false,
+ 				      MVPP2_PRS_UNTAGGED, MVPP2_PRS_EDSA);
++		spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ 		break;
+ 
+ 	default:
+@@ -2433,15 +2499,20 @@ int mvpp2_prs_add_flow(struct mvpp2 *priv, int flow, u32 ri, u32 ri_mask)
+ {
+ 	struct mvpp2_prs_entry pe;
+ 	u8 *ri_byte, *ri_byte_mask;
++	unsigned long flags;
+ 	int tid, i;
+ 
+ 	memset(&pe, 0, sizeof(pe));
+ 
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
++
+ 	tid = mvpp2_prs_tcam_first_free(priv,
+ 					MVPP2_PE_LAST_FREE_TID,
+ 					MVPP2_PE_FIRST_FREE_TID);
+-	if (tid < 0)
++	if (tid < 0) {
++		spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ 		return tid;
++	}
+ 
+ 	pe.index = tid;
+ 
+@@ -2461,6 +2532,7 @@ int mvpp2_prs_add_flow(struct mvpp2 *priv, int flow, u32 ri, u32 ri_mask)
+ 	mvpp2_prs_tcam_port_map_set(&pe, MVPP2_PRS_PORT_MASK);
+ 	mvpp2_prs_hw_write(priv, &pe);
+ 
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ 	return 0;
+ }
+ 
+@@ -2468,10 +2540,13 @@ int mvpp2_prs_add_flow(struct mvpp2 *priv, int flow, u32 ri, u32 ri_mask)
+ int mvpp2_prs_def_flow(struct mvpp2_port *port)
+ {
+ 	struct mvpp2_prs_entry pe;
++	unsigned long flags;
+ 	int tid;
+ 
+ 	memset(&pe, 0, sizeof(pe));
+ 
++	spin_lock_irqsave(&port->priv->prs_spinlock, flags);
++
+ 	tid = mvpp2_prs_flow_find(port->priv, port->id);
+ 
+ 	/* Such entry not exist */
+@@ -2480,8 +2555,10 @@ int mvpp2_prs_def_flow(struct mvpp2_port *port)
+ 		tid = mvpp2_prs_tcam_first_free(port->priv,
+ 						MVPP2_PE_LAST_FREE_TID,
+ 					       MVPP2_PE_FIRST_FREE_TID);
+-		if (tid < 0)
++		if (tid < 0) {
++			spin_unlock_irqrestore(&port->priv->prs_spinlock, flags);
+ 			return tid;
++		}
+ 
+ 		pe.index = tid;
+ 
+@@ -2492,28 +2569,33 @@ int mvpp2_prs_def_flow(struct mvpp2_port *port)
+ 		/* Update shadow table */
+ 		mvpp2_prs_shadow_set(port->priv, pe.index, MVPP2_PRS_LU_FLOWS);
+ 	} else {
+-		mvpp2_prs_init_from_hw(port->priv, &pe, tid);
++		mvpp2_prs_init_from_hw_unlocked(port->priv, &pe, tid);
+ 	}
+ 
+ 	mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_FLOWS);
+ 	mvpp2_prs_tcam_port_map_set(&pe, (1 << port->id));
+ 	mvpp2_prs_hw_write(port->priv, &pe);
+ 
++	spin_unlock_irqrestore(&port->priv->prs_spinlock, flags);
+ 	return 0;
+ }
+ 
+ int mvpp2_prs_hits(struct mvpp2 *priv, int index)
+ {
++	unsigned long flags;
+ 	u32 val;
+ 
+ 	if (index > MVPP2_PRS_TCAM_SRAM_SIZE)
+ 		return -EINVAL;
+ 
++	spin_lock_irqsave(&priv->prs_spinlock, flags);
++
+ 	mvpp2_write(priv, MVPP2_PRS_TCAM_HIT_IDX_REG, index);
+ 
+ 	val = mvpp2_read(priv, MVPP2_PRS_TCAM_HIT_CNT_REG);
+ 
+ 	val &= MVPP2_PRS_TCAM_HIT_CNT_MASK;
+ 
++	spin_unlock_irqrestore(&priv->prs_spinlock, flags);
+ 	return val;
+ }
+-- 
+2.43.0
+

patches/podman/4.5.0/0001-disable-pull-retry.patch

@@ -0,0 +1,22 @@
+This patch disables the default "podman pull" retry value, which is not
+used by Infix.  Instead, the container wrapper script retries on network
+related changes, or every 60 seconds.
+
+As of podman v5.0.0 a '--retry=NUM' has been added to the podman create,
+run, and pull commands.  However, CNI is no longer supported, and a lot
+of other breaking changes have been made, eg., output of podman inspect.
+So there's a lot of work to upgrade.
+
+   -- Joachim
+
+--- a/vendor/github.com/containers/common/libimage/copier.go	2023-04-14 15:28:20.000000000 +0200
++++ b/vendor/github.com/containers/common/libimage/copier.go	2024-11-16 13:05:42.207641898 +0100
+@@ -24,7 +24,7 @@
+ )
+ 
+ const (
+-	defaultMaxRetries = 3
++	defaultMaxRetries = 0
+ 	defaultRetryDelay = time.Second
+ )
+ 

patches/rauc/1.11.3/0003-src-install-print-bootname-when-checking-slot.patch

@@ -0,0 +1,29 @@
+This makes the output more user friendly on systems where the bootname
+is the common way to refer to a slot.
+
+Example output:
+...
+40% Checking slot rootfs.1 (secondary)
+46% Checking slot rootfs.1 (secondary) done.
+...
+
+diff --git a/src/install.c b/src/install.c
+index ea7c95b3..fb38bcab 100644
+--- a/src/install.c
++++ b/src/install.c
+@@ -965,7 +965,11 @@ static gboolean handle_slot_install_plan(const RaucManifest *manifest, const RIm
+ 
+ 	install_args_update(args, "Checking slot %s", plan->target_slot->name);
+ 
+-	r_context_begin_step_weighted_formatted("check_slot", 0, 1, "Checking slot %s", plan->target_slot->name);
++	r_context_begin_step_weighted_formatted("check_slot", 0, 1, "Checking slot %s%s%s%s",
++						plan->target_slot->name,
++						plan->target_slot->bootname ? " (" : "",
++						plan->target_slot->bootname ? plan->target_slot->bootname : "",
++						plan->target_slot->bootname ? ")" : "");
+ 
+ 	r_slot_status_load(plan->target_slot);
+ 	slot_state = plan->target_slot->status;
+-- 
+2.34.1
+

patches/rauc/1.11.3/0004-src-main-add-warning-banner-at-start-of-installation.patch

@@ -0,0 +1,24 @@
+Print "the standard" warning banner at start of installation.
+
+diff --git a/src/main.c b/src/main.c
+index 8e851b47..bba1d012 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -258,6 +258,14 @@ static gboolean install_start(int argc, char **argv)
+ 	if (access_args.http_headers)
+ 		args->access_args.http_headers = g_strdupv(access_args.http_headers);
+ 
++	g_print("+------------------------------------------------------------------------------+\n");
++	g_print("|                                                                              |\n");
++	g_print("|      [!] Installation might take a while. DO NOT power off the device.       |\n");
++	g_print("|                                                                              |\n");
++	g_print("|                   Please wait while the upgrade completes.                   |\n");
++	g_print("|                                                                              |\n");
++	g_print("+------------------------------------------------------------------------------+\n");
++
+ 	r_loop = g_main_loop_new(NULL, FALSE);
+ 	if (ENABLE_SERVICE) {
+ 		g_auto(GVariantDict) dict = G_VARIANT_DICT_INIT(NULL);
+-- 
+2.34.1
+

src/confd/src/core.c

@@ -66,8 +66,14 @@ int core_post_hook(sr_session_ctx_t *session, uint32_t sub_id, const char *modul
 		num_changes = 0;
 		return SR_ERR_OK;
 	case SR_EV_DONE:
+		if (num_changes <= 0) {
+			ERROR("BUG in core_post_hook(): callback tracking out of sync");
+			abort();
+		}
+
 		if (--num_changes == 0)
 			break;
+
 		return SR_ERR_OK;
 	default:
 		ERROR("core_post_hook() should not be called with event %s", ev2str(event));

src/confd/src/ietf-interfaces.c

@@ -1821,7 +1821,8 @@ static sr_error_t netdag_gen_iface(sr_session_ctx_t *session, struct dagger *net
 	      (op == LYDX_OP_NONE) ? "mod" : ((op == LYDX_OP_CREATE) ? "add" : "del"));
 
 	if (op == LYDX_OP_DELETE) {
-		err = netdag_gen_iface_del(net, dif, cif, fixed);
+		err  = netdag_gen_iface_del(net, dif, cif, fixed);
+		err += netdag_gen_ipv4_autoconf(net, cif, dif);
 		goto err;
 	}
 

src/confd/src/infix-containers.c

@@ -13,33 +13,50 @@
 #include <srx/srx_val.h>
 
 #include "core.h"
+
 #define  ARPING_MSEC  1000
+#define  LOGGER       "logger -t container -p local1.notice"
+
 #define  MODULE       "infix-containers"
 #define  CFG_XPATH    "/infix-containers:containers"
-#define  INBOX_QUEUE  "/run/containers/inbox"
-#define  JOB_QUEUE    "/run/containers/queue"
-#define  ACTIVE_QUEUE "/var/lib/containers/active"
-#define  LOGGER       "logger -t container -p local1.notice"
+
+#define  _PATH_CONT   "/run/containers"
+#define  _PATH_INBOX  _PATH_CONT "/INBOX"
 
 
 static int add(const char *name, struct lyd_node *cif)
 {
-	const char *image = lydx_get_cattr(cif, "image");
 	const char *restart_policy, *string;
 	struct lyd_node *node, *nets, *caps;
+	char script[strlen(name) + 5];
 	FILE *fp, *ap;
 
-	fp = fopenf("w", "%s/S01-%s.sh", INBOX_QUEUE, name);
+	/*
+	 * If running already, disable the service, keeping the created
+	 * container and any volumes for later if the user re-enables
+	 * it again.
+	 */
+	if (!lydx_is_enabled(cif, "enabled")) {
+		systemf("initctl -bnq disable container@%s.conf", name);
+		return 0;
+	}
+
+	snprintf(script, sizeof(script), "%s.sh", name);
+	fp = fopenf("w", "%s/%s", _PATH_CONT, script);
 	if (!fp) {
-		ERRNO("Failed adding job S01-%s.sh to job queue" INBOX_QUEUE, name);
+		ERRNO("Failed creating container script %s/%s", _PATH_CONT, script);
 		return SR_ERR_SYS;
 	}
 
-	/* Stop any running container gracefully so it releases its IP addresses. */
+	/*
+	 * Create /run/containers/<NAME>.sh it is used both for initial
+	 * setup at creation/boot and for manual upgrade.  The delete
+	 * command ensures any already running container is stopped and
+	 * deleted so that it releases all claimed resources.
+	 */
 	fprintf(fp, "#!/bin/sh\n"
-		"container stop %s   >/dev/null\n" /* Silence "not running" on upgrade */
-		"container delete %s >/dev/null\n" /* Silence any hashes when deleting */
-		"container", name, name);
+		"container --quiet delete %s >/dev/null\n"
+		"container --quiet", name);
 
 	LYX_LIST_FOR_EACH(lyd_child(cif), node, "dns")
 		fprintf(fp, " --dns %s", lyd_get_value(node));
@@ -56,9 +73,6 @@ static int add(const char *name, struct lyd_node *cif)
 			fprintf(fp, " --hostname %s", buf);
 	}
 
-	if (lydx_is_enabled(cif, "read-only"))
-		fprintf(fp, " --read-only");
-
 	if (lydx_is_enabled(cif, "privileged"))
 		fprintf(fp, " --privileged");
 
@@ -173,7 +187,17 @@ static int add(const char *name, struct lyd_node *cif)
 	if (lydx_is_enabled(cif, "manual"))
 		fprintf(fp, " --manual");
 
-	fprintf(fp, " create %s %s", name, image);
+	node = lydx_get_descendant(lyd_child(cif), "checksum", NULL);
+	if (node) {
+		if ((string = lydx_get_cattr(node, "md5")))
+			fprintf(fp, " --checksum md5:%s", string);
+		if ((string = lydx_get_cattr(node, "sha256")))
+			fprintf(fp, " --checksum sha256:%s", string);
+		if ((string = lydx_get_cattr(node, "sha512")))
+			fprintf(fp, " --checksum sha512:%s", string);
+	}
+
+	fprintf(fp, " create %s %s", name, lydx_get_cattr(cif, "image"));
 
  	if ((string = lydx_get_cattr(cif, "command")))
 		fprintf(fp, " %s", string);
@@ -182,41 +206,24 @@ static int add(const char *name, struct lyd_node *cif)
 	fchmod(fileno(fp), 0700);
 	fclose(fp);
 
+	/* Enable, or update, container -- both trigger setup script. */
 	systemf("initctl -bnq enable container@%s.conf", name);
+	systemf("initctl -bnq touch container@%s.conf", name);
 
 	return 0;
 }
 
 static int del(const char *name)
 {
-	const char *queue[] = {
-		JOB_QUEUE,
-		INBOX_QUEUE,
-		ACTIVE_QUEUE,
-	};
-	FILE *fp;
+	char fn[strlen(_PATH_CONT) + strlen(name) + 10];
 
-	/* Remove any pending download/create job first */
-	for (size_t i = 0; i < NELEMS(queue); i++) {
-		char fn[strlen(queue[i]) + strlen(name) + 5];
+	/* Remove container setup script */
+	snprintf(fn, sizeof(fn), "%s/%s.sh", _PATH_CONT, name);
+	erase(fn);
 
-		snprintf(fn, sizeof(fn), "%s/%s.sh", queue[i], name);
-		erase(fn);
-	}
-
-	/* Disable service and schedule for deletion. */
-	systemf("initctl -bnq disable container@%s.conf", name);
-
-	fp = fopenf("w", "%s/K01-%s.sh", INBOX_QUEUE, name);
-	if (!fp) {
-		ERRNO("Failed adding job 00-delete-%s.sh to job queue" INBOX_QUEUE, name);
-		return SR_ERR_SYS;
-	}
-
-	fprintf(fp, "#!/bin/sh\n"
-		"container delete %s\n", name);
-	fchmod(fileno(fp), 0700);
-	fclose(fp);
+	/* Stop and schedule for deletion */
+	systemf("initctl -bnq stop container:%s", name);
+	writesf(name, "a", "%s", _PATH_INBOX);
 
 	return SR_ERR_OK;
 }
@@ -258,15 +265,10 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module
 		}
 
 		LYX_LIST_FOR_EACH(cifs, cif, "container") {
-			const char *nm = lydx_get_cattr(cif, "name");
-
-			if (strcmp(name, nm))
+			if (strcmp(name, lydx_get_cattr(cif, "name")))
 				continue;
 
-			if (!lydx_is_enabled(cif, "enabled"))
-				del(name);
-			else
-				add(name, cif);
+			add(name, cif);
 			break;
 		}
 	}
@@ -333,124 +335,32 @@ static int oci_load(sr_session_ctx_t *session, uint32_t sub_id, const char *xpat
 	return SR_ERR_OK;
 }
 
-static int is_active(sr_session_ctx_t *session, const char *name)
-{
-	return srx_enabled(session, CFG_XPATH "/container[name='%s']/enabled", name);
-}
-
-static int is_manual(sr_session_ctx_t *session, const char *name)
-{
-	return srx_enabled(session, CFG_XPATH "/container[name='%s']/manual", name);
-}
-
-/*
- * When container configurations are not saved to startup-config and the
- * user reboot the system (or lose power) we will have lingering active
- * containers cached on persistent storage.
- *
- * This function runs every time a configuration is applied to clean up
- * any lingering active jobs to prevent false matches in the cmp magic
- * in the below post-hook.
- */
-static void cleanup(sr_session_ctx_t *session, struct confd *confd)
-{
-	struct dirent *d;
-	DIR *dir;
-
-	dir = opendir(ACTIVE_QUEUE);
-	if (!dir)
-		return;
-
-	while ((d = readdir(dir))) {
-		char name[strlen(ACTIVE_QUEUE) + strlen(d->d_name) + 2];
-		char *ptr;
-
-		if (d->d_name[0] == '.')
-			continue;
-
-		strlcpy(name, d->d_name, sizeof(name));
-		ptr = strstr(name, ".sh");
-		if (!ptr)
-			continue; /* odd, non-script file? */
-		*ptr = 0;
-
-		if (strncmp(name, "S01-", 4))
-			continue; /* odd, not start script? */
-
-		if (is_active(session, &name[4]))
-			continue;
-
-		/* Not found in running-config, remove stale cache. */
-		snprintf(name, sizeof(name), "%s/%s", ACTIVE_QUEUE, d->d_name);
-		if (erase(name))
-			ERRNO("Failed removing stale container job %s", name);
-	}
-
-	closedir(dir);
-}
-
 /*
  * Containers depend on a lot of other system resources being properly
  * set up, e.g., networking, which is run by dagger.  So we need to wait
- * for all that before we can launch new, or modified, containers.  The
- * latter is the tricky part.
- *
- * By default, containers get a writable layer which is preserved across
- * restarts/reboots of container or host -- provided we don't recreate
- * them on a reboot.  Hence the cmp magic below: we check if the command
- * to create a container is the same as what is already activated, if it
- * is already activated we know 'podman create' has done its thing and
- * we can safely start the container.
+ * for all that before we can launch new, or modified, containers.  This
+ * post hook runs as (one of) the last actions on a config change/boot.
  */
 void infix_containers_post_hook(sr_session_ctx_t *session, struct confd *confd)
 {
-	struct dirent *d;
-	DIR *dir;
+	char name[256];
+	FILE *fp;
 
-	cleanup(session, confd);
+	fp = fopen(_PATH_INBOX, "r");
+	if (!fp)
+		return;		/* nothing to delete */
 
-	dir = opendir(INBOX_QUEUE);
-	if (!dir) {
-		ERROR("Cannot open %s to launch scripts.", INBOX_QUEUE);
-		return;
+	while (fgets(name, sizeof(name), fp)) {
+		chomp(name);
+		systemf("initctl -bnq disable container@%s.conf", name);
+		systemf("container delete %s", name);
+		systemf("initctl -bnq cond clr container:%s", name);
 	}
 
-	while ((d = readdir(dir))) {
-		char curr[strlen(ACTIVE_QUEUE) + strlen(d->d_name) + 2];
-		char next[strlen(INBOX_QUEUE) + strlen(d->d_name) + 2];
+	fclose(fp);
+	erase(_PATH_INBOX);
 
-		if (d->d_name[0] == '.')
-			continue;
-
-		snprintf(curr, sizeof(curr), "%s/%s", ACTIVE_QUEUE, d->d_name);
-		snprintf(next, sizeof(next), "%s/%s", INBOX_QUEUE, d->d_name);
-		if (!systemf("cmp %s %s >/dev/null 2>&1", curr, next)) {
-			char name[strlen(d->d_name) + 1];
-			char *ptr;
-
-			strlcpy(name, d->d_name, sizeof(name));
-			ptr = strstr(name, ".sh");
-			if (ptr) {
-				char *nm = NULL;
-
-				*ptr = 0;
-				if (!strncmp(name, "S01-", 4))
-					nm = &name[4];
-
-				/* New job is already active, no changes, skipping ... */
-				if (nm && !is_manual(session, nm))
-					systemf("initctl -bnq cond set container:%s", nm);
-			}
-			remove(next);
-			continue;
-		}
-
-		if (movefile(next, JOB_QUEUE))
-			ERRNO("Failed moving %s to job queue %s", next, JOB_QUEUE);
-	}
-
-	closedir(dir);
-	systemf("container volume prune -f >/dev/null 2>&1");
+	systemf("podman volume prune -f");
 }
 
 int infix_containers_init(struct confd *confd)

src/confd/yang/confd.inc

@@ -27,7 +27,7 @@ MODULES=(
 	"ieee802-dot1q-types@2022-10-29.yang"
 	"infix-ip@2024-09-16.yang"
 	"infix-if-type@2024-10-13.yang"
-	"infix-routing@2024-10-01.yang"
+	"infix-routing@2024-11-15.yang"
 	"ieee802-dot1ab-lldp@2022-03-15.yang"
 	"infix-lldp@2023-08-23.yang"
 	"infix-dhcp-client@2024-09-20.yang"
@@ -37,7 +37,7 @@ MODULES=(
 	"ieee802-ethernet-interface@2019-06-21.yang"
 	"infix-ethernet-interface@2024-02-27.yang"
 	"infix-factory-default@2023-06-28.yang"
-	"infix-interfaces@2024-10-28.yang -e vlan-filtering"
+	"infix-interfaces@2024-11-27.yang -e vlan-filtering"
 
 	# from rousette
 	"ietf-restconf@2017-01-26.yang"

src/confd/yang/containers.inc

@@ -1,6 +1,6 @@
 # -*- sh -*-
 # REMEMBER TO UPDATE infix-interfaces ALSO IN confd.inc
 MODULES=(
-    "infix-interfaces@2024-10-28.yang -e vlan-filtering -e containers"
-    "infix-containers@2024-10-14.yang"
+    "infix-interfaces@2024-11-27.yang -e vlan-filtering -e containers"
+    "infix-containers@2024-11-15.yang"
 )

src/confd/yang/infix-containers.yang

@@ -6,10 +6,6 @@ module infix-containers {
   namespace "urn:ietf:params:xml:ns:yang:infix-containers";
   prefix infix-cont;
 
-  import ietf-yang-types {
-    prefix yang;
-  }
-
   import ietf-interfaces {
     prefix if;
   }
@@ -26,19 +22,26 @@ module infix-containers {
     prefix infix-sys;
   }
 
-  revision 2024-10-14  {
+  revision 2024-11-15 {
+    description "Two major changes:
+                  - Add support for ftp/http/https images with checksum
+                  - Deprecate read-only, it is now always true";
+    reference "internal";
+  }
+
+  revision 2024-10-14 {
     description "Two major changes:
                   - Allow changing name of host interfaces inside container
                   - Support hostname format specifiers, like ietf-system";
     reference "internal";
   }
 
-  revision 2024-03-27  {
+  revision 2024-03-27 {
     description "Add support for capabilities.";
     reference "internal";
   }
 
-  revision 2024-02-01  {
+  revision 2024-02-01 {
     description "Initial revision";
     reference "internal";
   }
@@ -133,6 +136,13 @@ module infix-containers {
                      oci-archive:/lib/oci/archive -- Use archive:latest from OCI archive
                                                      May be in .tar or .tar.gz format
 
+                     Additionally, the following URIs are also supported for setups
+                     that do not use a HUB or similar.  Recommend using 'checksum'!
+
+                     ftp://addr/path/to/archive   -- Downloaded using wget
+                     http://addr/path/to/archive  -- Downloaded using curl
+                     https://addr/path/to/archive -- Downloaded using curl
+
                      Note: if a remote repository cannot be reached, the creation of the
                            container will be put on a queue that retries pull every time
                            there is a route change in the host's system.";
@@ -140,6 +150,35 @@ module infix-containers {
 	type string;
       }
 
+      container checksum {
+	description "Checksum for ftp/http/https OCI archives.";
+        choice checksum {
+          leaf md5 {
+            description "MD5 checksum for the archive.";
+            type string {
+              length "32";
+              pattern "[a-fA-F0-9]{32}";
+            }
+          }
+
+          leaf sha256 {
+            description "SHA256 checksum for the archive.";
+            type string {
+              length "64";
+              pattern "[a-fA-F0-9]{64}";
+            }
+          }
+
+          leaf sha512 {
+            description "SHA512 checksum for the archive.";
+            type string {
+              length "128";
+              pattern "[a-fA-F0-9]{128}";
+            }
+          }
+        }
+      }
+
       leaf image-id {
         description "Docker image ID, exact hash used.";
         config false;
@@ -256,6 +295,7 @@ module infix-containers {
       }
 
       leaf read-only {
+        status deprecated; // This is now the default, setting kept only to not break configs
 	description "Create a read-only container.  Use volumes for writable directories.";
 	type boolean;
       }

src/confd/yang/infix-if-bridge.yang

@@ -3,9 +3,6 @@ submodule infix-if-bridge {
   belongs-to infix-interfaces {
     prefix infix-if;
   }
-  import ietf-yang-types {
-    prefix yang;
-  }
   import iana-if-type {
     prefix ianaift;
   }
@@ -15,9 +12,6 @@ submodule infix-if-bridge {
   import ietf-interfaces {
     prefix if;
   }
-  import ietf-inet-types {
-    prefix inet;
-  }
   import ietf-ip {
     prefix ip;
   }
@@ -32,6 +26,19 @@ submodule infix-if-bridge {
   contact      "kernelkit@googlegroups.com";
   description  "Linux bridge extension for ietf-interfaces.";
 
+  revision 2024-11-28 {
+    description "Drop must() expressions for IP addres on VLAN bridges.
+                 If a bridge is untagged member of a VLAN it should be
+                 possible to set an IP address on the bridge.
+
+                 Allow bridge port settings that also apply to the
+                 bridge itself (e.g., PVID) to be configured.";
+    reference "internal";
+  }
+  revision 2024-11-15 {
+    description "Fix pyang linter warnings, drop unused imports.";
+    reference "internal";
+  }
   revision 2024-08-26 {
     description "Improve must expressions for multicast.
 
@@ -426,19 +433,90 @@ submodule infix-if-bridge {
     }
   }
 
-  deviation "/if:interfaces/if:interface/ip:ipv4/ip:enabled" {
-    deviate add {
-      must "not(.) or count(../../infix-if:bridge/infix-if:vlans/infix-if:vlan) = 0" {
-	error-message "IPv4 address is not supported on VLAN filtering bridges.";
-      }
+  grouping bridge-port-common {
+    leaf pvid {
+      if-feature "vlan-filtering";
+      type dot1q-types:vlanid;
+      description "The primary VID assigned to this bridge port.";
     }
   }
 
-  deviation "/if:interfaces/if:interface/ip:ipv6/ip:enabled" {
-    deviate add {
-      must "not(.) or count(../../infix-if:bridge/infix-if:vlans/infix-if:vlan) = 0" {
-	error-message "IPv6 address is not supported on VLAN filtering bridges.";
+  grouping bridge-port-lower {
+    leaf bridge {
+      type if:interface-ref;
+      must "deref(.)/../bridge and not(. = ../../if:name)" {
+        error-message "Must refer to a bridge interface (and not itself).";
       }
+      mandatory true;
+      description "Bridge interface to which this interface is attached.";
+    }
+
+    container flood {
+      description "Control flooding of unknown BUM traffic.";
+
+      leaf broadcast {
+        description "Flood unknown broadcast traffic on this port.";
+        type boolean;
+        default true;
+      }
+
+      leaf unicast {
+        description "Flood unknown unicast traffic on this port.";
+        type boolean;
+        default true;
+      }
+
+      leaf multicast {
+        description "Flood unknown multicast traffic on this port.
+
+                         By default this option is enabled to allow MAC multicast
+                         to coexist unregulated with filtering of IP multicast.
+
+                         Flooding of IP multicast is done as long as the groups
+                         remain 'unknown', i.e., while there are no MDB entries
+                         set manually or automatically by IGMP/MLD.";
+        type boolean;
+        default true;
+      }
+    }
+
+    container multicast {
+      leaf fast-leave {
+        description "Assume this port is attached to an end-device.
+
+                         When enabled the bridge immediately cuts multicast
+                         groups when receiving a membership leave report.
+                         When disabled, group subscriptions linger until the
+                         group specific queries time out.";
+        type boolean;
+      }
+
+      leaf router {
+        description "Forward all known multicast on this port.
+
+                         Enable this for ports connected to a multicast router
+                         that is not PIM or multicast router discovery (mrdisc)
+                         capable.
+
+                         This setting is also useful for legacy equipment that
+                         does not support IGMP/MLD.  However, it is recommended
+                         to instead set up static MDB entries for such ports.";
+        type mrouter-port;
+        default auto;
+      }
+    }
+
+    leaf stp-state {
+      type stp-state;
+      config false;
+      description "The operation state of the bridge port.";
+    }
+
+    leaf default-priority {
+      if-feature "vlan-filtering";
+      type dot1q-types:priority-type;
+      default "0";
+      description "The default priority assigned to this bridge port.";
     }
   }
 
@@ -457,89 +535,10 @@ submodule infix-if-bridge {
       description "Extension of the IETF Interfaces model (RFC7223).";
 
       container bridge-port {
-        description "Bridge association and port specific setttngs.";
-
-        leaf bridge {
-          type if:interface-ref;
-          must "deref(.)/../bridge and not(. = ../../if:name)" {
-            error-message "Must refer to a bridge interface (and not itself).";
-          }
-          mandatory true;
-          description "Bridge interface to which this interface is attached.";
-        }
-
-        container flood {
-          description "Control flooding of unknown BUM traffic.";
-
-          leaf broadcast {
-            description "Flood unknown broadcast traffic on this port.";
-            type boolean;
-            default true;
-          }
-
-          leaf unicast {
-            description "Flood unknown unicast traffic on this port.";
-            type boolean;
-            default true;
-          }
-
-          leaf multicast {
-            description "Flood unknown multicast traffic on this port.
-
-                         By default this option is enabled to allow MAC multicast
-                         to coexist unregulated with filtering of IP multicast.
-
-                         Flooding of IP multicast is done as long as the groups
-                         remain 'unknown', i.e., while there are no MDB entries
-                         set manually or automatically by IGMP/MLD.";
-            type boolean;
-            default true;
-          }
-        }
-
-        container multicast {
-          leaf fast-leave {
-            description "Assume this port is attached to an end-device.
-
-                         When enabled the bridge immediately cuts multicast
-                         groups when receiving a membership leave report.
-                         When disabled, group subscriptions linger until the
-                         group specific queries time out.";
-            type boolean;
-          }
-
-          leaf router {
-            description "Forward all known multicast on this port.
-
-                         Enable this for ports connected to a multicast router
-                         that is not PIM or multicast router discovery (mrdisc)
-                         capable.
-
-                         This setting is also useful for legacy equipment that
-                         does not support IGMP/MLD.  However, it is recommended
-                         to instead set up static MDB entries for such ports.";
-            type mrouter-port;
-            default auto;
-          }
-        }
-
-        leaf stp-state {
-          type stp-state;
-          config false;
-          description "The operation state of the bridge port.";
-        }
-
-        leaf pvid {
-          if-feature "vlan-filtering";
-          type dot1q-types:vlanid;
-          description "The primary VID assigned to this bridge port.";
-        }
-
-        leaf default-priority {
-          if-feature "vlan-filtering";
-          type dot1q-types:priority-type;
-          default "0";
-          description "The default priority assigned to this bridge port.";
+        description "Bridge association and port specific settings.";
+        uses bridge-port-common;
+        uses bridge-port-lower {
+          when "not(derived-from-or-self(../if:type, 'ianaift:bridge'))";
         }
       }
     }