From 09f31750bb0c3c36f737bdf07228b96a15d57916 Mon Sep 17 00:00:00 2001
From: David Manouchehri <david.manouchehri@riseup.net>
Date: Wed, 26 Oct 2022 11:25:35 -0500
Subject: [PATCH] Only enable serial logins if enabled.

---
 lib/functions/rootfs/distro-agnostic.sh | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index e976fa7a33..c215b94f30 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -109,17 +109,19 @@ install_common() {
 	# set root password
 	chroot "${SDCARD}" /bin/bash -c "(echo $ROOTPWD;echo $ROOTPWD;) | passwd root >/dev/null 2>&1"
 
-	# enable automated login to console(s)
-	mkdir -p "${SDCARD}"/etc/systemd/system/getty@.service.d/
-	mkdir -p "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/
-	cat <<- EOF > "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/override.conf
-		[Service]
-		ExecStartPre=/bin/sh -c 'exec /bin/sleep 10'
-		ExecStart=
-		ExecStart=-/sbin/agetty --noissue --autologin root %I \$TERM
-		Type=idle
-	EOF
-	cp "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/override.conf "${SDCARD}"/etc/systemd/system/getty@.service.d/override.conf
+	if [[ $SERIAL_AUTOLOGIN == yes ]]; then
+		# enable automated login to console(s)
+		mkdir -p "${SDCARD}"/etc/systemd/system/getty@.service.d/
+		mkdir -p "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/
+		cat <<- EOF > "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/override.conf
+			[Service]
+			ExecStartPre=/bin/sh -c 'exec /bin/sleep 10'
+			ExecStart=
+			ExecStart=-/sbin/agetty --noissue --autologin root %I \$TERM
+			Type=idle
+		EOF
+		cp "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/override.conf "${SDCARD}"/etc/systemd/system/getty@.service.d/override.conf
+	fi
 
 	# force change root password at first login
 	#chroot "${SDCARD}" /bin/bash -c "chage -d 0 root"