mkosi 20 → 22

README.md

@@ -1,12 +1,12 @@
 # ServNest system images generator
 
-This is the sources to build system images of ServNest using mkosi 20. You can then use them with systemd-nspawn.
+This is the sources to build system images of ServNest using mkosi 22. You can then use them with systemd-nspawn.
 
 This repository also contains configuration files and installation scripts inside `install` that may also be useful for the manual installation process, without mkosi.
 
 ## Usage
 
-This generator allows to build images for both Arch Linux and Debian Testing, you can replace `<sysid>` by either `sn-arch` or `sn-debian` in the following examples. Note that mkosi may require tools that are not available on your distribution.
+This generator allows to build images for both Arch Linux and Debian, you can replace `<sysid>` by either `sn-arch` or `sn-debian` in the following examples. Note that mkosi may require tools that are not available on your distribution.
 
 First:
 - Put the ServNest source code inside `mkosi.extra/srv/servnest/core/`

mkosi.conf

@@ -7,8 +7,8 @@ OutputDirectory = /var/lib/machines
 Autologin = yes
 Hostname = servnest.test
 WithDocs = yes
-WithNetwork = yes
 Packages =
+	iproute2
 	tor
 	torsocks
 	openssl

mkosi.finalize.chroot

@@ -1,9 +1,4 @@
 #!/usr/bin/bash
-
-if [ "$container" != "mkosi" ]; then
-	exec mkosi-chroot "$SCRIPT" "$@"
-fi
-
 set -euo pipefail
 
 source /etc/os-release

mkosi.images/sn-arch.conf

@@ -1,3 +1,6 @@
+[Output]
+ImageId = sn-arch
+
 [Distribution]
 Distribution = arch
 

mkosi.images/sn-debian.conf

@@ -1,3 +1,6 @@
+[Output]
+ImageId = sn-debian
+
 [Distribution]
 Distribution = debian
 Release = bookworm

mkosi.postinst.chroot

@@ -1,9 +1,4 @@
 #!/usr/bin/bash
-
-if [ "$container" != "mkosi" ]; then
-	exec mkosi-chroot "$SCRIPT" "$@"
-fi
-
 set -euo pipefail
 
 source /etc/os-release