From 6e8f511e4bf0f9d55c02462696f7cbd4aeb6679a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 9 Dec 2020 13:12:10 -0800
Subject: [PATCH] Add fprintd-pam to a new critical-path-standard group

We had a situation with an fprintd update that broke su and
console logins:
https://bodhi.fedoraproject.org/updates/FEDORA-2020-f997de7d0e
so clearly fprintd should be on the critical path. This is my
best guess as to how we should best do this (will discuss
details in the PR).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 comps-f32.xml.in |  1 +
 comps-f33.xml.in |  1 +
 comps-f34.xml.in | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/comps-f32.xml.in b/comps-f32.xml.in
index 6f990c1d..a3bad4b6 100644
--- a/comps-f32.xml.in
+++ b/comps-f32.xml.in
@@ -686,6 +686,7 @@
       <packagereq type="mandatory">dbus-broker</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
+      <packagereq type="mandatory">fprintd-pam</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
       <packagereq type="mandatory">initial-setup</packagereq>
       <!-- 'kernel' is listed because we need to ensure that kernel
diff --git a/comps-f33.xml.in b/comps-f33.xml.in
index f6092dd2..8073f738 100644
--- a/comps-f33.xml.in
+++ b/comps-f33.xml.in
@@ -658,6 +658,7 @@
       <packagereq type="mandatory">dbus-broker</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
+      <packagereq type="mandatory">fprintd-pam</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
       <packagereq type="mandatory">initial-setup</packagereq>
       <!-- 'kernel' is listed because we need to ensure that kernel
diff --git a/comps-f34.xml.in b/comps-f34.xml.in
index 32e5634c..fde1f964 100644
--- a/comps-f34.xml.in
+++ b/comps-f34.xml.in
@@ -754,6 +754,17 @@
       <packagereq type="default">notification-daemon</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>critical-path-standard</id>
+    <_name>Critical Path (standard)</_name>
+    <!-- not all deliverables include @standard, critical-path-base only includes stuff from @base -->
+    <_description>A set of packages that relate to Critical Path functionality and are in standard but not base</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">fprintd-pam</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>critical-path-xfce</id>
     <_name>Critical Path (Xfce)</_name>