diff options
| -rw-r--r-- | .github/workflows/mkosi.yml | 2 | ||||
| -rw-r--r-- | mkosi.conf.d/20-debian.conf | 1 | ||||
| -rwxr-xr-x | mkosi.postinst | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 4e77af75d7..d974152be1 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -73,7 +73,7 @@ jobs: steps: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - - uses: systemd/mkosi@268a9374d5a93a4021db6521a39db2c2ed9fd755 + - uses: systemd/mkosi@ebc8b63f3be58243c7ff4273517fa4d2858c7e30 - name: Configure run: | diff --git a/mkosi.conf.d/20-debian.conf b/mkosi.conf.d/20-debian.conf index 61a86310e4..011f6e9296 100644 --- a/mkosi.conf.d/20-debian.conf +++ b/mkosi.conf.d/20-debian.conf @@ -8,6 +8,7 @@ Release=testing [Content] Packages= + ?priority(required) btrfs-progs cryptsetup-bin dbus-broker diff --git a/mkosi.postinst b/mkosi.postinst index 5aad60f97d..24b4666ad7 100755 --- a/mkosi.postinst +++ b/mkosi.postinst @@ -62,3 +62,8 @@ if [ -n "$IMAGE_VERSION" ] ; then -e "\$aIMAGE_VERSION=$IMAGE_VERSION" \ /usr/lib/os-release fi + +# Install a default ignore preset on Debian until it is shipped by Debian itself. +if grep -q -e "ID=debian" -e "ID_LIKE=debian" /etc/os-release; then + echo "ignore *" >/usr/lib/systemd/system-preset/99-ignore.preset +fi |