From dd577dde5ef13b0b0a2d3e55a375ddc8c44284e9 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Wed, 28 Aug 2024 13:53:31 +0100
Subject: [PATCH] mkosi: use util-linux's autologin

login is now from util-linux so credentials are supported.
It also needs to be pulled in as it's Protected: yes rather than
Essential: yes.

Keep the old setting for Ubuntu as that still uses login from shadow.

(cherry picked from commit ec540290177ea208eafb6dfd49de2d9344bee4ce)
---
 mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 5 +----
 mkosi.conf.d/10-ubuntu/mkosi.conf        | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index d14746f1ed8..472064e45d0 100644
--- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -8,10 +8,6 @@ Distribution=|ubuntu
 PackageManagerTrees=mkosi-pinning.pref:/etc/apt/preferences.d/mkosi-pinning.pref
 
 [Content]
-# Debian ships /usr/bin/login from shadow instead of util-linux which doesn't support credentials so we
-# enable autologin the old-fashioned way.
-Autologin=yes
-
 VolatilePackages=
         libnss-myhostname
         libnss-mymachines
@@ -58,6 +54,7 @@ Packages=
         knot
         libcap-ng-utils
         locales
+        login
         man-db
         multipath-tools
         ncat
diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.conf.d/10-ubuntu/mkosi.conf
index 1ffa3ab0318..73faafe6c0b 100644
--- a/mkosi.conf.d/10-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-ubuntu/mkosi.conf
@@ -8,6 +8,9 @@ Release=noble
 Repositories=universe
 
 [Content]
+# Ubuntu ships /usr/bin/login from shadow instead of util-linux which doesn't support credentials so we
+# enable autologin the old-fashioned way.
+Autologin=yes
 Packages=
         linux-image-generic
         linux-tools-common