Merge pull request #32386 from DaanDeMeyer/mkosi

Various mkosi improvements

.github/workflows/mkosi.yml

@@ -74,7 +74,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
-    - uses: systemd/mkosi@236784dbb597321eedab50cef06cc49f92c57293
+    - uses: systemd/mkosi@6ab7d9f09f8f2633f4b7c777a04e62e109486e2f
 
     # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
     # immediately, we remove the files in the background. However, we first move them to a different location

mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf

@@ -6,10 +6,11 @@ Distribution=arch
 [Content]
 VolatilePackages=
         systemd
-        systemd-ukify
-        systemd-sysvcompat
+        systemd-libs
         systemd-resolvconf
+        systemd-sysvcompat
         systemd-tests
+        systemd-ukify
 
 Packages=
         bpf
@@ -25,6 +26,7 @@ Packages=
         git
         gnutls
         iproute
+        iputils
         linux
         man-db
         openbsd-netcat
@@ -33,6 +35,7 @@ Packages=
         pacman
         pkgconf
         polkit
+        procps-ng
         quota-tools
         sbsigntools
         shadow
@@ -45,4 +48,5 @@ InitrdPackages=
 
 InitrdVolatilePackages=
         systemd
+        systemd-libs
         systemd-sysvcompat

mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot

@@ -74,6 +74,7 @@ ANNOBIN="no-active-checks" rpmbuild \
     --define "_find_debuginfo_dwz_opts %{nil}" \
     --define "_fortify_level 0" \
     --undefine _lto_cflags \
+    --undefine _package_note_flags \
     --noclean \
     "pkg/$ID/systemd.spec"
 

mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf

@@ -30,6 +30,7 @@ Packages=
         integritysetup
         iproute
         iproute-tc
+        iputils
         kernel-core
         libasan
         libcap-ng-utils
@@ -41,6 +42,7 @@ Packages=
         p11-kit
         pam
         passwd
+        policycoreutils
         polkit
         procps-ng
         quota
@@ -50,7 +52,6 @@ Packages=
         selinux-policy
         selinux-policy-targeted
         setools-console
-        policycoreutils
         util-linux
         vim-common
 

mkosi.images/system/mkosi.conf.d/10-centos/mkosi.extra/usr/lib/sysusers.d/20-setup-groups.conf

@@ -0,0 +1,24 @@
+g root 0
+g bin 1
+g daemon 2
+g sys 3
+g adm 4
+g tty 5
+g disk 6
+g lp 7
+g mem 8
+g kmem 9
+g wheel 10
+g cdrom 11
+g mail 12
+g man 15
+g dialout 18
+g floppy 19
+g games 20
+g tape 33
+g video 39
+g ftp 50
+g lock 54
+g audio 63
+g users 100
+g nobody 65534

mkosi.images/system/mkosi.conf.d/10-centos/mkosi.extra/usr/lib/sysusers.d/20-setup-users.conf

@@ -0,0 +1,13 @@
+u root 0:0 "Super User" /root /bin/bash
+u bin 1:1 "bin" /bin -
+u daemon 2:2 "daemon" /sbin -
+u adm 3:4 "adm" /var/adm -
+u lp 4:7 "lp" /var/spool/lpd -
+u sync 5:0 "sync" /sbin /bin/sync
+u shutdown 6:0 "shutdown" /sbin /sbin/shutdown
+u halt 7:0 "halt" /sbin /sbin/halt
+u mail 8:12 "mail" /var/spool/mail -
+u operator 11:0 "operator" /root -
+u games 12:100 "games" /usr/games -
+u ftp 14:50 "FTP User" /var/ftp -
+u nobody 65534:65534 "Kernel Overflow User" - -

mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf

@@ -46,6 +46,7 @@ Packages=
         fdisk
         git-core
         iproute2
+        iputils-ping
         isc-dhcp-server
         libcap-ng-utils
         libtss2-rc0

mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf

@@ -36,7 +36,13 @@ Packages=
         git-core
         glibc-locale-base
         grep
+        group(bin)
+        group(daemon)
+        group(games)
+        group(nobody)
+        group(root)
         gzip
+        iputils
         kernel-kvmsmall
         kmod
         libasan8
@@ -46,6 +52,7 @@ Packages=
         openssh-server
         pam
         patterns-base-minimal_base
+        procps4
         python3-pefile
         quota
         rpm-build
@@ -54,6 +61,11 @@ Packages=
         sed
         shadow
         timezone
+        user(bin)
+        user(daemon)
+        user(games)
+        user(nobody)
+        user(root)
         vim
         xz
 

mkosi.images/system/mkosi.postinst.chroot

@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 
+# Make sure serial console line wrapping is re-enabled as qemu's seabios firmware disables serial console
+# line-wrapping on boot.
+echo "tput smam || :" >>/etc/profile
+
 if [ -n "$SANITIZERS" ]; then
     LD_PRELOAD=$(ldd /usr/lib/systemd/systemd | grep libasan.so | awk '{print $3}')