From de75e2a09f2baaf5e47c53888b2ba924be3ed7d7 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 15 Jan 2019 12:09:57 -0500
Subject: [PATCH] citadel.image.conf is not used anymore

---
 meta-citadel/recipes-citadel/citadel-config/citadel-config.bb | 4 ----
 .../citadel-config/files/citadel/citadel-image.conf           | 4 ----
 2 files changed, 8 deletions(-)
 delete mode 100644 meta-citadel/recipes-citadel/citadel-config/files/citadel/citadel-image.conf

diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
index e3e73d4..6a95076 100644
--- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
@@ -48,7 +48,6 @@ SRC_URI = "\
     file://iptables-flush.sh \
     file://systemd/zram-swap.service \
     file://systemd/iptables.service \
-    file://citadel/citadel-image.conf \
     ${DEFAULT_REALM_UNITS} \
     ${MODPROBE_CONFIG} \
     ${SYSCTL_CONFIG} \
@@ -79,7 +78,6 @@ do_install() {
     install -m 0755 -d ${D}${sysconfdir}/NetworkManager
     install -m 0755 -d ${D}${sysconfdir}/polkit-1/rules.d
     install -m 0755 -d ${D}${sysconfdir}/modprobe.d
-    install -m 0755 -d ${D}${datadir}/citadel
     install -m 0755 -d ${D}${datadir}/iptables
     install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager
     install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager/system-connections
@@ -123,8 +121,6 @@ do_install() {
 
     install -m 0644 ${WORKDIR}/modprobe.d/audio_powersave.conf ${D}${sysconfdir}/modprobe.d/
 
-    install -m 0644 ${S}/citadel/citadel-image.conf ${D}${datadir}/citadel
-
     # This probably belongs in lvm2 recipe
     install -d ${D}${systemd_system_unitdir}/sysinit.target.wants
     ln -s ../lvm2-lvmetad.socket ${D}${systemd_system_unitdir}/sysinit.target.wants/lvm2-lvmetad.socket
diff --git a/meta-citadel/recipes-citadel/citadel-config/files/citadel/citadel-image.conf b/meta-citadel/recipes-citadel/citadel-config/files/citadel/citadel-image.conf
deleted file mode 100644
index 7b356ea..0000000
--- a/meta-citadel/recipes-citadel/citadel-config/files/citadel/citadel-image.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[channel.testing]
-update_server = ""
-pubkey = "2adc094a709bb3f81f9b311dbd702b1d5598be8e80e2afac3b4e4eb66bbf82a4"
-keypair = "27e8068b7daae47b1be878326259cb77b267b1214becd42cbe501f02e3fb7dc72adc094a709bb3f81f9b311dbd702b1d5598be8e80e2afac3b4e4eb66bbf82a4"