From 166bcaf95fbdd036f99705d2204138c36eb95836 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 22 Jan 2024 12:04:45 +0100 Subject: [PATCH] mkosi: Use authselect local profile if it exists authselect 1.5.0 removed the "minimal" profile and added the "local" profile instead. Let's modify our post-installation script to take these changes into account. --- mkosi.images/system/mkosi.postinst.chroot | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mkosi.images/system/mkosi.postinst.chroot b/mkosi.images/system/mkosi.postinst.chroot index 0fec067ebb2..692242da38f 100755 --- a/mkosi.images/system/mkosi.postinst.chroot +++ b/mkosi.images/system/mkosi.postinst.chroot @@ -65,9 +65,17 @@ if [ -n "$IMAGE_VERSION" ] ; then fi if command -v authselect >/dev/null; then - authselect select minimal + # authselect 1.5.0 renamed the minimal profile to the local profile without keeping backwards compat so + # let's use the new name if it exists. + if [ -d /usr/share/authselect/default/local ]; then + PROFILE=local + else + PROFILE=minimal + fi - if authselect list-features minimal | grep -q "with-homed"; then + authselect select "$PROFILE" + + if authselect list-features "$PROFILE" | grep -q "with-homed"; then authselect enable-feature with-homed fi fi