Move shared mkosi settings to a single file in mkosi.default.d/
This commit is contained in:
parent
3c2c8e62c9
commit
6242cda99d
|
@ -29,11 +29,14 @@ jobs:
|
||||||
- name: Install
|
- name: Install
|
||||||
run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect
|
run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect
|
||||||
|
|
||||||
|
- name: Symlink
|
||||||
|
run: ln -s .mkosi/mkosi.${{ matrix.distro }} mkosi.default
|
||||||
|
|
||||||
- name: Build ${{ matrix.distro }}
|
- name: Build ${{ matrix.distro }}
|
||||||
run: sudo python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless build
|
run: sudo python3 -m mkosi --password= --qemu-headless build
|
||||||
|
|
||||||
- name: Boot ${{ matrix.distro }} systemd-nspawn
|
- name: Boot ${{ matrix.distro }} systemd-nspawn
|
||||||
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless boot
|
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot
|
||||||
|
|
||||||
- name: Boot ${{ matrix.distro }} QEMU
|
- name: Boot ${{ matrix.distro }} QEMU
|
||||||
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless qemu
|
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless qemu
|
||||||
|
|
|
@ -36,4 +36,6 @@ __pycache__/
|
||||||
/mkosi.builddir/
|
/mkosi.builddir/
|
||||||
/mkosi.output/
|
/mkosi.output/
|
||||||
/mkosi.default
|
/mkosi.default
|
||||||
|
mkosi.default.d/*
|
||||||
|
!mkosi.default.d/10-systemd.conf
|
||||||
/tags
|
/tags
|
||||||
|
|
|
@ -8,16 +8,7 @@
|
||||||
[Distribution]
|
[Distribution]
|
||||||
Distribution=arch
|
Distribution=arch
|
||||||
|
|
||||||
[Output]
|
|
||||||
Format=raw_btrfs
|
|
||||||
Bootable=yes
|
|
||||||
HostonlyInitrd=yes
|
|
||||||
|
|
||||||
[Partitions]
|
|
||||||
RootSize=3G
|
|
||||||
|
|
||||||
[Packages]
|
[Packages]
|
||||||
Cache=/var/cache/pacman/pkg/
|
|
||||||
BuildPackages=
|
BuildPackages=
|
||||||
acl
|
acl
|
||||||
bzip2
|
bzip2
|
||||||
|
@ -61,11 +52,3 @@ Packages=
|
||||||
qrencode
|
qrencode
|
||||||
strace
|
strace
|
||||||
vi
|
vi
|
||||||
|
|
||||||
[Host]
|
|
||||||
QemuHeadless=yes
|
|
||||||
NetworkVeth=yes
|
|
||||||
|
|
||||||
[Validation]
|
|
||||||
Password=
|
|
||||||
Autologin=yes
|
|
||||||
|
|
|
@ -7,14 +7,6 @@
|
||||||
Distribution=debian
|
Distribution=debian
|
||||||
Release=unstable
|
Release=unstable
|
||||||
|
|
||||||
[Output]
|
|
||||||
Format=raw_btrfs
|
|
||||||
Bootable=yes
|
|
||||||
HostonlyInitrd=yes
|
|
||||||
|
|
||||||
[Partitions]
|
|
||||||
RootSize=2G
|
|
||||||
|
|
||||||
[Packages]
|
[Packages]
|
||||||
BuildPackages=
|
BuildPackages=
|
||||||
acl
|
acl
|
||||||
|
@ -77,11 +69,3 @@ Packages=
|
||||||
nano
|
nano
|
||||||
strace
|
strace
|
||||||
vim-tiny
|
vim-tiny
|
||||||
|
|
||||||
[Host]
|
|
||||||
QemuHeadless=yes
|
|
||||||
NetworkVeth=yes
|
|
||||||
|
|
||||||
[Validation]
|
|
||||||
Password=
|
|
||||||
Autologin=yes
|
|
||||||
|
|
|
@ -7,14 +7,6 @@
|
||||||
Distribution=fedora
|
Distribution=fedora
|
||||||
Release=33
|
Release=33
|
||||||
|
|
||||||
[Output]
|
|
||||||
Format=gpt_ext4
|
|
||||||
Bootable=yes
|
|
||||||
HostonlyInitrd=yes
|
|
||||||
|
|
||||||
[Partitions]
|
|
||||||
RootSize=3G
|
|
||||||
|
|
||||||
[Packages]
|
[Packages]
|
||||||
BuildPackages=
|
BuildPackages=
|
||||||
audit-libs-devel
|
audit-libs-devel
|
||||||
|
@ -84,14 +76,3 @@ Packages=
|
||||||
strace
|
strace
|
||||||
tpm2-tss
|
tpm2-tss
|
||||||
vi
|
vi
|
||||||
|
|
||||||
BuildDirectory=mkosi.builddir
|
|
||||||
Cache=mkosi.cache
|
|
||||||
|
|
||||||
[Host]
|
|
||||||
QemuHeadless=yes
|
|
||||||
NetworkVeth=yes
|
|
||||||
|
|
||||||
[Validation]
|
|
||||||
Password=
|
|
||||||
Autologin=yes
|
|
||||||
|
|
|
@ -7,18 +7,7 @@
|
||||||
Distribution=opensuse
|
Distribution=opensuse
|
||||||
Release=tumbleweed
|
Release=tumbleweed
|
||||||
|
|
||||||
[Output]
|
|
||||||
Format=raw_btrfs
|
|
||||||
Bootable=yes
|
|
||||||
HostonlyInitrd=yes
|
|
||||||
|
|
||||||
[Partitions]
|
|
||||||
RootSize=3G
|
|
||||||
|
|
||||||
[Packages]
|
[Packages]
|
||||||
# Uncomment to share system RPM cache (works only with Tumbleweed)
|
|
||||||
#Cache=/var/cache/zypp/packages
|
|
||||||
BuildDirectory=mkosi.builddir
|
|
||||||
BuildPackages=
|
BuildPackages=
|
||||||
docbook-xsl-stylesheets
|
docbook-xsl-stylesheets
|
||||||
fdupes
|
fdupes
|
||||||
|
@ -81,11 +70,3 @@ Packages=
|
||||||
strace
|
strace
|
||||||
util-linux
|
util-linux
|
||||||
vi
|
vi
|
||||||
|
|
||||||
[Host]
|
|
||||||
QemuHeadless=yes
|
|
||||||
NetworkVeth=yes
|
|
||||||
|
|
||||||
[Validation]
|
|
||||||
Password=
|
|
||||||
Autologin=yes
|
|
||||||
|
|
|
@ -8,14 +8,6 @@ Distribution=ubuntu
|
||||||
Release=focal
|
Release=focal
|
||||||
Repositories=main,universe
|
Repositories=main,universe
|
||||||
|
|
||||||
[Output]
|
|
||||||
Format=raw_btrfs
|
|
||||||
Bootable=yes
|
|
||||||
HostonlyInitrd=yes
|
|
||||||
|
|
||||||
[Partitions]
|
|
||||||
RootSize=2G
|
|
||||||
|
|
||||||
[Packages]
|
[Packages]
|
||||||
BuildPackages=
|
BuildPackages=
|
||||||
acl
|
acl
|
||||||
|
@ -80,11 +72,3 @@ Packages=
|
||||||
nano
|
nano
|
||||||
strace
|
strace
|
||||||
vim-tiny
|
vim-tiny
|
||||||
|
|
||||||
[Host]
|
|
||||||
QemuHeadless=yes
|
|
||||||
NetworkVeth=yes
|
|
||||||
|
|
||||||
[Validation]
|
|
||||||
Password=
|
|
||||||
Autologin=yes
|
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
# 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]
|
||||||
|
Format=gpt_btrfs
|
||||||
|
Bootable=yes
|
||||||
|
HostonlyInitrd=yes
|
||||||
|
|
||||||
|
[Packages]
|
||||||
|
BuildDirectory=mkosi.builddir
|
||||||
|
Cache=mkosi.cache
|
||||||
|
|
||||||
|
[Host]
|
||||||
|
QemuHeadless=yes
|
||||||
|
NetworkVeth=yes
|
||||||
|
|
||||||
|
[Validation]
|
||||||
|
Password=
|
||||||
|
Autologin=yes
|
Loading…
Reference in New Issue