More progress

- Switched to bridge for main interface
- Updated rockpro64 config to include KVM and more tweaks
- Added libvirt services
- Switched to mdevd
- Added more manual modules
- Fixed /dev problems
- Added standard groups for /dev
- Tweaked utmpd
- Tweaked udev
- Bumped kernel

main/lfsbase/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=lfsbase
-pkgver=1.0
+pkgver=1.2
 pkgrel=0
 pkgdesc="Base directory structure for linux"
 url="none"
@@ -81,7 +81,7 @@ package() {
 }
 
 sha512sums="
-e322a393aee9633981cb8669af30429899fed859e9709d4b888d17af43feb65474fe822e7aa8f06e7127ee7b6cf2d66d2f56698fd4314e0f8ab737ce275d1914  group
+fc9508f3f3a731b428d7a7f2dda5fd34d855a1bbbb5f8afd22da64cfc3b0354888b25452ac2e1500424aa2eda7ca6fb44c993e17c1912535d60f8bc64487f52b  group
 f6fe247889a9c09a1c6ac6b1f5baae9ecc9f6300594428dc04dd8e7543c06b4774f57cf034e970a913faf7bbf0aff28b170e5c6425ab04b380b34a3b80a3b529  passwd
 2e0c19c08bc161278db950ca66c138091724a134ccbaa655cb7efa933f32ce28cfc006a563d0c150646c8ac7b6c84ab03f0958fd1a55c17e7d3f91c9ff0c1e94  profile
 "

main/lfsbase/group

@@ -1,4 +1,21 @@
 root:x:0:root
+tty:x:5:
+disk:x:6:root
+mem:x:8:
+kmem:x:9:
+floppy:x:11:root
+uucp:x:14:uucp
+console:x:17:
+audio:x:18:
+cdrom:x:19:
+dialout:x:20:root
+input:x:23:
+tape:x:26:root
+video:x:27:root
+netdev:x:28:
+kvm:x:34:
 shadow:x:42:
+usb:x:85:
+utmp:x:406:
 nogroup:x:65533:
 nobody:x:65534:

main/linux/APKBUILD

@@ -3,10 +3,9 @@
 # Maintainer: Alex Denes <caskd@redxen.eu>
 
    pkgname=linux
-     _kver=5.16
-   _kpatch=16
-    pkgver=$_kver.$_kpatch
-    pkgrel=0
+  majorver=5
+  minorver=18
+  patchver=12
 
 _configs="
 	config-full.x86_64
@@ -15,13 +14,30 @@ _configs="
 	config-rockpro64.aarch64
 "
 
+_patches="
+"
+
+pkgver="$majorver.$minorver"
+pkgrel=0
+if [ "$patchver" != 0 ]; then
+	_patches="
+		$_patches
+		patch.xz::https://cdn.kernel.org/pub/linux/kernel/v$majorver.x/patch-$majorver.$minorver.$patchver.xz
+	"
+	pkgver="$pkgver.$patchver"
+fi
+
+_kbdir="linux-$majorver.$minorver"
+
 source="
-	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$pkgver.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$majorver.x/linux-$majorver.$minorver.tar.gz
+	$_patches
 	$_configs
 "
 
+
 _kabi= _klocalver= _kconfig= _kbdmain= _kbddev= _kflavor=
-_kdir_src="$srcdir/linux-$pkgver"
+_kdir_src="$srcdir/$_kbdir"
 
 arch="noarch"
 _depends_dev="
@@ -38,9 +54,10 @@ makedepends="
 	linux-headers
 	installkernel
 	bc
-	openssl-dev
+	openssl1.1-compat-dev
 	diffutils
 	findutils
+	build-base
 "
 
 pkgdesc="Linux Kernel - Metapackage"
@@ -229,8 +246,9 @@ _pkg_extmod() {
 }
 
 sha512sums="
-a922b950fd3803b922be40c826554359f44f9eea8bc44be89c1db1e7173fb7726601373fdf37256eab85a644eccc774fdbcec407c7154c233117e0331f028ef8  linux-5.16.16.tar.xz
+6d9d53fc37345298255b7e3c32724426dba22f903697061d7fc0bd5c819aa35f9fd101d7d91038fb814966fdcf395bdf9d39d1c4c0d4ac1217d29dda15f4f3e4  linux-5.18.tar.gz
+f05070722545b324cdf5d59288b752c896916301b767fd7323e398ab814f1c1e43e6670e450f8aacf2602b5de54659d0ebec008147135f665016ea43e9671779  patch.xz
 0db424b64b50a1ffda7a8591526eb3d4d77b97b74aeee49810ef05730f95622573775026073ce57e43b4389c5c2ba075be42c49b5c3fd5e745d8c6b948a77b62  config-full.x86_64
 acc7f183a6773d3de0e10c808cbfadb7b54b6f9fcf891234473adef449f87e04a486ed6ec3fae106d0ff10f0c4bc3224971319aeba03fbcaafb1590e89c5ae84  config-slim.x86_64
-ad69e8a63a9aae01191e751520dc50ed43397770b90b154e9b4fc5129765f29d93d36f219ee62dda9f3826fdc0e2b312aaaac2edc998c1a073efb1200ada1338  config-rockpro64.aarch64
+27264221f47097dc24e0547333b1ce9ae6d87db2f80dbf5be3ec07fdd3a3431c8dd90154d40b1561ea5834cdef1f4fc9c5940e643b6490043df9a339b0083339  config-rockpro64.aarch64
 "

main/nnd-s6-services/APKBUILD

@@ -1,14 +1,14 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=nnd-s6-services
-pkgver=0.8
+pkgver=0.23
 pkgrel=0
 pkgdesc="Base services for s6"
 url="none"
 arch="noarch"
 license="MIT"
 depends="s6-rc s6-portable-utils s6-linux-utils"
-subpackages="$pkgname-core $pkgname-net $pkgname-desktop"
+subpackages="$pkgname-core $pkgname-net $pkgname-desktop $pkgname-libvirt"
 builddir="$srcdir/"
 
 prepare() {
@@ -38,6 +38,10 @@ desktop() {
 	amove etc/s6/rc/desktop
 }
 
+libvirt() {
+	amove etc/s6/rc/libvirt
+}
+
 check() {
 	s6-rc-compile "$builddir"/compiled "$builddir"/rc/*
 }

main/nnd-s6-services/manage.sh

@@ -40,18 +40,17 @@ update() {
 }
 
 swap() {
-	ln -sfn "current.$DB_FRESH_NAC" "$S6_SV_PATH/current" || ERR="$?" error "Failed to update A/B current symlink"
+	if [ -d "$S6_SV_PATH/current.$DB_FRESH_NAC" ]; then
+		ln -sfn "current.$DB_FRESH_NAC" "$S6_SV_PATH/current" || ERR="$?" error "Failed to update A/B current symlink"
+	else
+		error "There's no database to switch to"
+	fi
 }
 
 for act in $@; do
 	cstate
-	if [ "$act" == "generate" ]; then
-		generate
-	elif [ "$act" == "update" ]; then
-		update
-	elif [ "$act" == "swap" ]; then
-		swap
-	else
-		error "Action must be generate, update or swap"
-	fi
+	case "$act" in
+		generate|update|swap) eval "$act";;
+		*) error "Invalid action $act";;
+	esac
 done

main/nnd-s6-services/rc/core/clock.hw/up

@@ -5,7 +5,4 @@ emptyenv
 
 export PATH $PATH
 
-fdclose 1
-fdclose 2
-
 exec hwclock -u --systz

main/nnd-s6-services/rc/core/dir.var-log/up

@@ -6,7 +6,4 @@ emptyenv
 export PATH $PATH
 define DIR /var/log
 
-fdclose 1
-fdclose 2
-
 exec mkdir -p $DIR

main/nnd-s6-services/rc/core/getty.tty1/run

@@ -7,7 +7,4 @@ export PATH $PATH
 define BAUD 38400
 define TTY tty1
 
-fdclose 1
-fdclose 2
-
 exec getty ${BAUD} ${TTY}

main/nnd-s6-services/rc/core/hostname/up

@@ -6,7 +6,4 @@ emptyenv
 define HOSTNAME localhost
 export PATH $PATH
 
-fdclose 1
-fdclose 2
-
 redirfd -w 1 /proc/sys/kernel/hostname echo $HOSTNAME

main/nnd-s6-services/rc/core/klogd/run

@@ -6,6 +6,4 @@ emptyenv
 export PATH $PATH
 define READFROM /proc/kmsg
 
-fdmove -c 2 1
-
 redirfd -r 0 $READFROM ucspilogd

main/nnd-s6-services/rc/core/kmod.sysfs/up

@@ -5,9 +5,6 @@ emptyenv
 
 export PATH $PATH
 
-fdclose 1
-fdclose 2
-
 if -t {
 	pipeline {
 		pipeline {

main/nnd-s6-services/rc/core/mdevd-coldplug/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/core/mdevd-coldplug/up

@@ -0,0 +1,8 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+
+mdevd-coldplug

main/nnd-s6-services/rc/core/mdevd/notification-fd

@@ -0,0 +1 @@
+3

main/nnd-s6-services/rc/core/mdevd/run

@@ -0,0 +1,9 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define NOTIFYFD 3
+
+mdevd -D $NOTIFYFD

main/nnd-s6-services/rc/core/module.apparmor/up

@@ -6,7 +6,4 @@ emptyenv
 export PATH $PATH
 define MODULE apparmor
 
-fdclose 1
-fdclose 2
-
-exec modprobe ${MODULE}
+exec modprobe $MODULE

main/nnd-s6-services/rc/core/module.fuse/down

@@ -0,0 +1,12 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define MODULE fuse
+
+fdclose 1
+fdclose 2
+
+exec rmmod ${MODULE}

main/nnd-s6-services/rc/core/module.fuse/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/core/module.fuse/up

@@ -0,0 +1,9 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define MODULE fuse
+
+exec modprobe $MODULE

main/nnd-s6-services/rc/core/module.tun/down

@@ -4,9 +4,9 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-define USER sshd
+define MODULE tun
 
 fdclose 1
 fdclose 2
 
-exec deluser $USER
+exec rmmod ${MODULE}

main/nnd-s6-services/rc/core/module.tun/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/core/module.tun/up

@@ -0,0 +1,9 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define MODULE tun
+
+exec modprobe $MODULE

main/nnd-s6-services/rc/core/mount.dev/up

@@ -4,12 +4,12 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-
-fdclose 1
-fdclose 2
+define DEST /dev
+define FSTYPE devtmpfs
+define OPTS nosuid,noexec,mode=755
 
 foreground {
-	exec mount -t devtmpfs none /dev
+	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS dev $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

main/nnd-s6-services/rc/core/mount.devpts/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/core/mount.devpts/up

@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define DEST /dev/pts
+define FSTYPE devpts
+define OPTS nosuid,noexec,mode=620
+
+foreground {
+	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS pts $DEST
+} if -nt {
+	importas status ? test $status -eq 1
+}

main/nnd-s6-services/rc/core/mount.mqueue/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/core/mount.mqueue/up

@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define DEST /dev/mqueue
+define FSTYPE mqueue
+define OPTS nosuid,noexec,nodev
+
+foreground {
+	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS mqueue $DEST
+} if -nt {
+	importas status ? test $status -eq 1
+}

main/nnd-s6-services/rc/core/mount.proc/up

@@ -4,12 +4,12 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-
-fdclose 1
-fdclose 2
+define DEST /proc
+define FSTYPE proc
+define OPTS nosuid,nodev,noexec,hidepid=2
 
 foreground {
-	exec mount -t proc none /proc
+	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS proc $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

main/nnd-s6-services/rc/core/mount.run/up

@@ -4,8 +4,8 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
+define DEST /run
+define FSTYPE tmpfs
+define OPTS nodev,nosuid
 
-fdclose 1
-fdclose 2
-
-exec mount -t tmpfs none /run
+foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS run $DEST

main/nnd-s6-services/rc/core/mount.rw/up

@@ -4,9 +4,8 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-define ROOTFSTYPE ext4
+define DEST /
+define FSTYPE ext4
+define OPTS remount,rw
 
-fdclose 1
-fdclose 2
-
-exec mount -t $ROOTFSTYPE -o remount,rw /
+foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS none $DEST

main/nnd-s6-services/rc/core/mount.securityfs/up

@@ -4,13 +4,12 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-define SECURITYFSPATH /sys/kernel/security
-
-fdclose 1
-fdclose 2
+define DEST /sys/kernel/security
+define FSTYPE securityfs
+define OPTS nosuid,nodev,noexec
 
 foreground {
-	exec mount -t securityfs securityfs $SECURITYFSPATH
+	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS securityfs $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

main/nnd-s6-services/rc/core/mount.shm/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/core/mount.shm/up

@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define DEST /dev/shm
+define FSTYPE shm
+define OPTS nosuid,noexec
+
+foreground {
+	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS shm $DEST
+} if -nt {
+	importas status ? test $status -eq 1
+}

main/nnd-s6-services/rc/core/mount.sys/up

@@ -4,12 +4,12 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-
-fdclose 1
-fdclose 2
+define DEST /sys
+define FSTYPE sysfs
+define OPTS nosuid,nodev,noexec
 
 foreground {
-	exec mount -t sysfs none /sys
+	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS sysfs $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

main/nnd-s6-services/rc/core/mount.tmp/up

@@ -4,8 +4,8 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
+define DEST /tmp
+define FSTYPE tmpfs
+define OPTS nodev,nosuid
 
-fdclose 1
-fdclose 2
-
-exec mount -t tmpfs none /tmp
+foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS tmp $DEST

main/nnd-s6-services/rc/core/utmpd/run

@@ -6,9 +6,6 @@ emptyenv
 export PATH $PATH
 define SOCKET /run/utmps/.utmpd-socket
 
-fdclose 1
-fdclose 2
-
 foreground { mkdir -p /var/log }
 foreground { touch /var/log/wtmp }
 foreground { chmod 644 /var/log/wtmp }

main/nnd-s6-services/rc/desktop/udevd.settle/up

@@ -5,7 +5,4 @@ emptyenv
 
 export PATH $PATH
 
-fdclose 1
-fdclose 2
-
 exec udevadm settle

main/nnd-s6-services/rc/desktop/udevd.trigger/up

@@ -5,8 +5,5 @@ emptyenv
 
 export PATH $PATH
 
-fdclose 1
-fdclose 2
-
-foreground { udevadm trigger --action=add --type=subsystems }
-foreground { udevadm trigger --action=add --type=devices }
+foreground { exec udevadm trigger --action=add --type=subsystems }
+foreground { exec udevadm trigger --action=add --type=devices }

main/nnd-s6-services/rc/libvirt/virtinterfaced/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE interface
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtinterfaced/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/libvirt/virtlockd/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE lock
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtlockd/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/libvirt/virtlogd/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE log
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtlogd/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/libvirt/virtlxcd/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE lxc
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtlxcd/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/libvirt/virtnetworkd/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE network
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtnetworkd/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/libvirt/virtnodedevd/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE nodedev
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtnodedevd/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/libvirt/virtproxyd/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE proxy
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtproxyd/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/libvirt/virtqemud/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE qemu
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtqemud/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/libvirt/virtstoraged/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SERVICE storage
+define CONFIG /etc/libvirt/virt${SERVICE}d.conf
+
+fdclose 1
+fdclose 2
+
+virt${SERVICE}d

main/nnd-s6-services/rc/libvirt/virtstoraged/type

@@ -0,0 +1 @@
+longrun