From 85fe7415103a6dd9554a9146ef9a79b9fb2d91b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
Date: Mon, 23 Aug 2021 12:02:29 +0200
Subject: [PATCH] Switch from authconfig to authselect (rhbz#1982158)

---
 ...switch-from-authconfig-to-authselect.patch | 36 +++++++++++++++++++
 appliance-tools.spec                          |  6 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 0002-switch-from-authconfig-to-authselect.patch

diff --git a/0002-switch-from-authconfig-to-authselect.patch b/0002-switch-from-authconfig-to-authselect.patch
new file mode 100644
index 0000000..d81ec1b
--- /dev/null
+++ b/0002-switch-from-authconfig-to-authselect.patch
@@ -0,0 +1,36 @@
+From d1d2eac31801a0aa99159ea9b575fe3e85d5fde8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
+Date: Fri, 9 Jul 2021 14:18:58 +0200
+Subject: [PATCH] switch from authconfig to authselect
+
+Authconfig compatibility tool (from authselect-compat) will be removed from Fedora 35:
+https://fedoraproject.org/wiki/Changes/RemoveAuthselectCompatPackage
+---
+ config/fedora-aos.ks | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/config/fedora-aos.ks b/config/fedora-aos.ks
+index 97ad20cd0bd3dbf3fe6d0f453776c37770dac206..0f49d90f66caf6250444f5f6df9de87d1fc21e2f 100644
+--- a/config/fedora-aos.ks
++++ b/config/fedora-aos.ks
+@@ -4,7 +4,7 @@
+ lang C
+ keyboard us
+ timezone US/Eastern
+-auth --useshadow --enablemd5
++authselect select sssd with-silent-lastlog --force
+ selinux --permissive
+ firewall --disabled
+ bootloader --timeout=1 --append="acpi=force console=ttyS0,115200"
+@@ -72,8 +72,6 @@ iputils
+ -setserial
+ -ed
+ 
+-# Remove the authconfig pieces
+--authconfig
+ -rhpl
+ -wireless-tools
+ 
+-- 
+2.31.1
+
diff --git a/appliance-tools.spec b/appliance-tools.spec
index 7e31ce0..56fe93b 100644
--- a/appliance-tools.spec
+++ b/appliance-tools.spec
@@ -21,7 +21,7 @@
 Name: appliance-tools
 Summary: Tools for building Appliances
 Version: 011.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 URL: https://pagure.io/appliance-tools
 
@@ -29,6 +29,7 @@ Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 
 # Backports from upstream
 Patch0001: 0001-Ignore-grub2-install-errors-if-they-are-expected.patch
+Patch0002: 0002-switch-from-authconfig-to-authselect.patch
 
 # Ensure system deps are installed (rhbz#1409536)
 Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}}
@@ -77,6 +78,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{python_sitelib}/ec2convert/
 
 %changelog
+* Mon Aug 23 2021 Pavel Březina <pbrezina@redhat.com> - 011.1-6
+- Switch from authconfig to authselect (rhbz#1982158)
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 011.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild