mkosi: Update to latest
This update introduces the explicit Dependencies= setting, instead of relying on implicit dependencies via alphanumerical ordering. We also take the opportunity to rename the "final" preset to the "system" preset, which seems like a better name.
This commit is contained in:
@@ -76,7 +76,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
|
||||
- uses: systemd/mkosi@f61dac009ee584797e61a961d508cc52d7f4a03c
|
||||
- uses: systemd/mkosi@9ffcdac128c66935aa5d5a98633fa7498bce92d1
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
@@ -106,17 +106,17 @@ jobs:
|
||||
# For erofs, we have to install linux-modules-extra-azure, but that doesn't match the running kernel
|
||||
# version, so we can't load the erofs module. squashfs is a builtin module so we use that instead.
|
||||
|
||||
mkdir -p mkosi.presets/20-final/mkosi.repart/10-usr.conf.d
|
||||
tee mkosi.presets/20-final/mkosi.repart/10-usr.conf.d/squashfs.conf <<- EOF
|
||||
mkdir -p mkosi.presets/system/mkosi.repart/10-usr.conf.d
|
||||
tee mkosi.presets/system/mkosi.repart/10-usr.conf.d/squashfs.conf <<- EOF
|
||||
[Partition]
|
||||
Format=squashfs
|
||||
EOF
|
||||
|
||||
# The emergency shell is not useful in the CI, as it just blocks for a long time before the job
|
||||
# eventually times out. Override it to just shutdown immediately.
|
||||
mkdir -p mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
|
||||
mkdir -p mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
|
||||
tee mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf <<- EOF
|
||||
mkdir -p mkosi.presets/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
|
||||
mkdir -p mkosi.presets/system/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
|
||||
tee mkosi.presets/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf <<- EOF
|
||||
[Unit]
|
||||
FailureAction=exit
|
||||
[Service]
|
||||
@@ -124,7 +124,7 @@ jobs:
|
||||
ExecStart=
|
||||
ExecStart=false
|
||||
EOF
|
||||
cp mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf
|
||||
cp mkosi.presets/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf mkosi.presets/system/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf
|
||||
|
||||
- name: Generate secure boot key
|
||||
run: mkosi --debug genkey
|
||||
|
||||
Reference in New Issue
Block a user