diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-09-01 13:58:16 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-09-05 15:28:23 +0200 |
| commit | 35356d7f3fa449b35b8ee5ebd8d65d2ba875493d (patch) | |
| tree | bdbb6120d18e5e5cd49122ba386b23e63acd9079 /mkosi.conf.d | |
| parent | mkosi: Re-enable arch but disable keyring checking (diff) | |
| download | systemd-35356d7f3fa449b35b8ee5ebd8d65d2ba875493d.tar.xz systemd-35356d7f3fa449b35b8ee5ebd8d65d2ba875493d.zip | |
mkosi: Update to latest
Configuration now takes priority over CLI options so we have to
configure the defaults for settings that we want to allow overriding
from the CLI. We also explicitly set some other settings so that they
can't be overridden from the CLI anymore. For example the base and
initrd image should never be made bootable so we set Bootable=no
explicitly for both.
Diffstat (limited to 'mkosi.conf.d')
| -rw-r--r-- | mkosi.conf.d/05-qemu-mem.conf | 2 | ||||
| -rw-r--r-- | mkosi.conf.d/10-centos.conf | 2 | ||||
| -rw-r--r-- | mkosi.conf.d/10-debian.conf | 2 | ||||
| -rw-r--r-- | mkosi.conf.d/10-fedora.conf | 2 | ||||
| -rw-r--r-- | mkosi.conf.d/10-opensuse.conf | 2 | ||||
| -rw-r--r-- | mkosi.conf.d/10-systemd.conf | 4 | ||||
| -rw-r--r-- | mkosi.conf.d/10-ubuntu.conf | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/mkosi.conf.d/05-qemu-mem.conf b/mkosi.conf.d/05-qemu-mem.conf index 7dd02925c0..3a6f24a7b0 100644 --- a/mkosi.conf.d/05-qemu-mem.conf +++ b/mkosi.conf.d/05-qemu-mem.conf @@ -8,4 +8,4 @@ Distribution=|arch Distribution=|centos [Host] -QemuMem=3G +@QemuMem=3G diff --git a/mkosi.conf.d/10-centos.conf b/mkosi.conf.d/10-centos.conf index 6932b8b29c..ae2706c791 100644 --- a/mkosi.conf.d/10-centos.conf +++ b/mkosi.conf.d/10-centos.conf @@ -4,7 +4,7 @@ Distribution=centos [Distribution] -Release=9 +@Release=9 Repositories=epel epel-next hyperscale-packages-main diff --git a/mkosi.conf.d/10-debian.conf b/mkosi.conf.d/10-debian.conf index 0eeaf07400..8674e884fa 100644 --- a/mkosi.conf.d/10-debian.conf +++ b/mkosi.conf.d/10-debian.conf @@ -4,4 +4,4 @@ Distribution=debian [Distribution] -Release=testing +@Release=testing diff --git a/mkosi.conf.d/10-fedora.conf b/mkosi.conf.d/10-fedora.conf index 4511dcdf87..0196c9f745 100644 --- a/mkosi.conf.d/10-fedora.conf +++ b/mkosi.conf.d/10-fedora.conf @@ -4,4 +4,4 @@ Distribution=fedora [Distribution] -Release=38 +@Release=38 diff --git a/mkosi.conf.d/10-opensuse.conf b/mkosi.conf.d/10-opensuse.conf index 98a7b4ef5c..832c0d15fb 100644 --- a/mkosi.conf.d/10-opensuse.conf +++ b/mkosi.conf.d/10-opensuse.conf @@ -4,4 +4,4 @@ Distribution=opensuse [Distribution] -Release=tumbleweed +@Release=tumbleweed diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf index adf3316ca5..f25d53d2b7 100644 --- a/mkosi.conf.d/10-systemd.conf +++ b/mkosi.conf.d/10-systemd.conf @@ -12,8 +12,8 @@ Environment=ASAN_OPTIONS=verify_asan_link_order=false MKOSI_UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1 [Host] -Incremental=yes -QemuMem=2G +@Incremental=yes +@QemuMem=2G ExtraSearchPaths=build/ # Make sure we don't trigger systemd-firstboot prompting for the root password. Credentials=passwd.plaintext-password.root= diff --git a/mkosi.conf.d/10-ubuntu.conf b/mkosi.conf.d/10-ubuntu.conf index d6ea6d1708..b0ebbadd48 100644 --- a/mkosi.conf.d/10-ubuntu.conf +++ b/mkosi.conf.d/10-ubuntu.conf @@ -4,5 +4,5 @@ Distribution=ubuntu [Distribution] -Release=jammy +@Release=jammy Repositories=universe |