Merge pull request #28401 from keszybz/set-console-size

[thirdparty/systemd.git] / mkosi.conf.d / 10-systemd.conf

diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index 0eeee89052a105d1403eb6d5fbb1777618cc0bec..adf3316ca5372c73bc893e9c4fde2a32e29439a3 100644 (file)
--- a/mkosi.conf.d/10-systemd.conf
+++ b/mkosi.conf.d/10-systemd.conf
@@ -1,76 +1,36 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-
 [Output]
-Bootable=yes
+OutputDirectory=mkosi.output
+BuildDirectory=mkosi.builddir
+CacheDirectory=mkosi.cache
+
+[Content]
 # Prevent ASAN warnings when building the image and ship the real ASAN options prefixed with MKOSI_.
 Environment=ASAN_OPTIONS=verify_asan_link_order=false
             MKOSI_ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
             MKOSI_UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
-OutputDirectory=mkosi.output
-
-[Content]
-BuildDirectory=mkosi.builddir
-Cache=mkosi.cache
-Packages=
-        acl
-        bash-completion
-        coreutils
-        diffutils
-        dnsmasq
-        dosfstools
-        e2fsprogs
-        findutils
-        gcc # For sanitizer libraries
-        gdb
-        grep
-        kbd
-        kexec-tools
-        kmod
-        less
-        mtools
-        nano
-        nftables
-        openssl
-        python3
-        qrencode
-        sed
-        strace
-        tree
-        util-linux
-        valgrind
-        wireguard-tools
-        xfsprogs
-        zsh
-
-BuildPackages=
-        bc
-        binutils
-        bison
-        clang
-        flex
-        gcc
-        gettext
-        git
-        gnu-efi
-        gperf
-        lld
-        llvm
-        make
-        meson
-        pkgconf
-        rpm
-        rsync
-        tar
-        zstd
 
 [Host]
-QemuHeadless=yes
-Netdev=yes
+Incremental=yes
 QemuMem=2G
 ExtraSearchPaths=build/
-
-[Validation]
-Password=
-Autologin=yes
+# Make sure we don't trigger systemd-firstboot prompting for the root password.
+Credentials=passwd.plaintext-password.root=
+KernelCommandLineExtra=systemd.crash_shell
+                       systemd.log_level=debug
+                       systemd.log_ratelimit_kmsg=0
+                       systemd.journald.forward_to_console
+                       systemd.journald.max_level_console=warning
+                       # Disable the kernel's ratelimiting on userspace logging to kmsg.
+                       printk.devkmsg=on
+                       # Make sure /sysroot is mounted rw in the initrd.
+                       rw
+                       # Lower the default device timeout so we get a shell earlier if the root device does
+                       # not appear for some reason.
+                       systemd.default_device_timeout_sec=10
+                       # Make sure no LSMs are enabled by default.
+                       apparmor=0
+                       selinux=0
+                       enforcing=0
+                       systemd.early_core_pattern=/core