From 022f6c3b34ad36db9ce7bf3e86b2141559f3b178 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Nov 01 2019 12:46:56 +0000
Subject: IoT: clevis defaults update


Drop this as it conflicts with feature changes in F-32+

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>

---

diff --git a/fedora-release.spec b/fedora-release.spec
index edd44c9..a90dbf3 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -14,7 +14,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        32
-Release:        0.3
+Release:        0.4
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -32,7 +32,6 @@ Source17:       org.projectatomic.rpmostree1.rules
 Source18:       80-iot.preset
 Source19:       distro-template.swidtag
 Source20:       distro-edition-template.swidtag
-Source21:       iot-clevis.conf
 Source22:       80-coreos.preset
 
 BuildArch:      noarch
@@ -595,7 +594,6 @@ echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
 %{_prefix}/lib/os-release.iot
 %{_prefix}/lib/systemd/system-preset/80-iot.preset
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.iot
-%{_sysconfdir}/dracut.conf.d/iot-clevis.conf
 
 
 %files kde
@@ -647,6 +645,9 @@ echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
 
 
 %changelog
+* Wed Oct 30 2019 Peter Robinson <pbrobinson@fedoraproject.org> 32-0.4
+- Drop clevis IoT defaults change
+
 * Mon Oct 21 2019 Michael Nguyen <mnguyen@redhat.com> - 32-0.3
 - Update os-release information for Fedora CoreOS
 
diff --git a/iot-clevis.conf b/iot-clevis.conf
deleted file mode 100644
index 53ad74f..0000000
--- a/iot-clevis.conf
+++ /dev/null
@@ -1 +0,0 @@
-omit_dracutmodules+="network ifcfg"