X Tutup
Skip to content

Commit 6242cda

Browse files
daandemeyerbluca
daandemeyer
authored and
bluca
committed
Move shared mkosi settings to a single file in mkosi.default.d/
1 parent 3c2c8e6 commit 6242cda

File tree

8 files changed

+28
-90
lines changed

8 files changed

+28
-90
lines changed

‎.github/workflows/mkosi.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@ jobs:
2929
- name: Install
3030
run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect
3131

32+
- name: Symlink
33+
run: ln -s .mkosi/mkosi.${{ matrix.distro }} mkosi.default
34+
3235
- name: Build ${{ matrix.distro }}
33-
run: sudo python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless build
36+
run: sudo python3 -m mkosi --password= --qemu-headless build
3437

3538
- name: Boot ${{ matrix.distro }} systemd-nspawn
36-
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless boot
39+
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot
3740

3841
- name: Boot ${{ matrix.distro }} QEMU
39-
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless qemu
42+
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless qemu

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@ __pycache__/
3636
/mkosi.builddir/
3737
/mkosi.output/
3838
/mkosi.default
39+
mkosi.default.d/*
40+
!mkosi.default.d/10-systemd.conf
3941
/tags

‎.mkosi/mkosi.arch‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,7 @@
88
[Distribution]
99
Distribution=arch
1010

11-
[Output]
12-
Format=raw_btrfs
13-
Bootable=yes
14-
HostonlyInitrd=yes
15-
16-
[Partitions]
17-
RootSize=3G
18-
1911
[Packages]
20-
Cache=/var/cache/pacman/pkg/
2112
BuildPackages=
2213
acl
2314
bzip2
@@ -61,11 +52,3 @@ Packages=
6152
qrencode
6253
strace
6354
vi
64-
65-
[Host]
66-
QemuHeadless=yes
67-
NetworkVeth=yes
68-
69-
[Validation]
70-
Password=
71-
Autologin=yes

‎.mkosi/mkosi.debian‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
Distribution=debian
88
Release=unstable
99

10-
[Output]
11-
Format=raw_btrfs
12-
Bootable=yes
13-
HostonlyInitrd=yes
14-
15-
[Partitions]
16-
RootSize=2G
17-
1810
[Packages]
1911
BuildPackages=
2012
acl
@@ -77,11 +69,3 @@ Packages=
7769
nano
7870
strace
7971
vim-tiny
80-
81-
[Host]
82-
QemuHeadless=yes
83-
NetworkVeth=yes
84-
85-
[Validation]
86-
Password=
87-
Autologin=yes

‎.mkosi/mkosi.fedora‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
Distribution=fedora
88
Release=33
99

10-
[Output]
11-
Format=gpt_ext4
12-
Bootable=yes
13-
HostonlyInitrd=yes
14-
15-
[Partitions]
16-
RootSize=3G
17-
1810
[Packages]
1911
BuildPackages=
2012
audit-libs-devel
@@ -84,14 +76,3 @@ Packages=
8476
strace
8577
tpm2-tss
8678
vi
87-
88-
BuildDirectory=mkosi.builddir
89-
Cache=mkosi.cache
90-
91-
[Host]
92-
QemuHeadless=yes
93-
NetworkVeth=yes
94-
95-
[Validation]
96-
Password=
97-
Autologin=yes

‎.mkosi/mkosi.opensuse‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,7 @@
77
Distribution=opensuse
88
Release=tumbleweed
99

10-
[Output]
11-
Format=raw_btrfs
12-
Bootable=yes
13-
HostonlyInitrd=yes
14-
15-
[Partitions]
16-
RootSize=3G
17-
1810
[Packages]
19-
# Uncomment to share system RPM cache (works only with Tumbleweed)
20-
#Cache=/var/cache/zypp/packages
21-
BuildDirectory=mkosi.builddir
2211
BuildPackages=
2312
docbook-xsl-stylesheets
2413
fdupes
@@ -81,11 +70,3 @@ Packages=
8170
strace
8271
util-linux
8372
vi
84-
85-
[Host]
86-
QemuHeadless=yes
87-
NetworkVeth=yes
88-
89-
[Validation]
90-
Password=
91-
Autologin=yes

‎.mkosi/mkosi.ubuntu‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ Distribution=ubuntu
88
Release=focal
99
Repositories=main,universe
1010

11-
[Output]
12-
Format=raw_btrfs
13-
Bootable=yes
14-
HostonlyInitrd=yes
15-
16-
[Partitions]
17-
RootSize=2G
18-
1911
[Packages]
2012
BuildPackages=
2113
acl
@@ -80,11 +72,3 @@ Packages=
8072
nano
8173
strace
8274
vim-tiny
83-
84-
[Host]
85-
QemuHeadless=yes
86-
NetworkVeth=yes
87-
88-
[Validation]
89-
Password=
90-
Autologin=yes

‎mkosi.default.d/10-systemd.conf‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# SPDX-License-Identifier: LGPL-2.1-or-later
2+
3+
# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
4+
5+
[Output]
6+
Format=gpt_btrfs
7+
Bootable=yes
8+
HostonlyInitrd=yes
9+
10+
[Packages]
11+
BuildDirectory=mkosi.builddir
12+
Cache=mkosi.cache
13+
14+
[Host]
15+
QemuHeadless=yes
16+
NetworkVeth=yes
17+
18+
[Validation]
19+
Password=
20+
Autologin=yes

0 commit comments

Comments
 (0)
X Tutup