From 97385889a3aa10fe8146f77fab39ab2f7456aac9 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Mon, 31 Dec 2018 18:39:55 -0500
Subject: [PATCH] various changes related to installer and images

---
 .../citadel-config/citadel-config.bb          | 24 +++++++++++++++++++
 .../files/citadel/citadel-image.conf          |  4 ++++
 .../citadel-config/files/fstab                |  1 -
 .../systemd/launch-default-realm.service      |  2 ++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create 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 cb5ccd2..c974996 100644
--- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
@@ -41,6 +41,7 @@ SRC_URI = "\
     file://share/dot.vimrc \
     file://polkit/citadel.rules \
     file://systemd/zram-swap.service \
+    file://citadel/citadel-image.conf \
     ${DEFAULT_REALM_UNITS} \
     ${MODPROBE_CONFIG} \
     ${SYSCTL_CONFIG} \
@@ -70,6 +71,7 @@ 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 0700 -d ${D}${localstatedir}/lib/NetworkManager
     install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager/system-connections
 
@@ -107,9 +109,31 @@ 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
+
     ln -s /storage/citadel-state/resolv.conf ${D}${sysconfdir}/resolv.conf
     ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/etc.conf
     ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/home.conf
+
+    install -d ${D}${datadir}/themes
+    install -d ${D}${datadir}/icons
+    install -d ${D}${libdir}/modules
+    install -d ${D}${libdir}/firmware
+    install -d ${D}${datadir}/backgrounds
+    install -d ${D}/opt/share
+
+    ln -sf /opt/share/themes/Adapta ${D}/usr/share/themes/Adapta
+    ln -sf /opt/share/themes/Adapta-Eta ${D}/usr/share/themes/Adapta-Eta
+    ln -sf /opt/share/themes/Adapta-Nokto ${D}/usr/share/themes/Adapta-Nokto
+    ln -sf /opt/share/themes/Adapta-Nokto-Eta ${D}/usr/share/themes/Adapta-Nokto-Eta
+    ln -sf /opt/share/icons/Paper ${D}/usr/share/icons/Paper
+    ln -sf /opt/share/icons/Adwaita ${D}/usr/share/icons/Adwaita
+    ln -sf /opt/share/backgrounds/gnome ${D}/usr/share/backgrounds/gnome
+    ln -sf /opt/share/gnome-background-properties ${D}/usr/share/gnome-background-properties
 }
 
 FILES_${PN} = "/"
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
new file mode 100644
index 0000000..7b356ea
--- /dev/null
+++ b/meta-citadel/recipes-citadel/citadel-config/files/citadel/citadel-image.conf
@@ -0,0 +1,4 @@
+[channel.testing]
+update_server = ""
+pubkey = "2adc094a709bb3f81f9b311dbd702b1d5598be8e80e2afac3b4e4eb66bbf82a4"
+keypair = "27e8068b7daae47b1be878326259cb77b267b1214becd42cbe501f02e3fb7dc72adc094a709bb3f81f9b311dbd702b1d5598be8e80e2afac3b4e4eb66bbf82a4"
diff --git a/meta-citadel/recipes-citadel/citadel-config/files/fstab b/meta-citadel/recipes-citadel/citadel-config/files/fstab
index 1aa4839..8a915e1 100644
--- a/meta-citadel/recipes-citadel/citadel-config/files/fstab
+++ b/meta-citadel/recipes-citadel/citadel-config/files/fstab
@@ -1,4 +1,3 @@
-/dev/root                           /             auto       defaults                    1  1
 /dev/mapper/citadel-storage         /storage      auto       defaults,nossd,noatime,commit=120 0  0
 /storage/citadel-state/var          /var          none       bind                        0  0
 /storage/realms                     /realms       none       bind                        0  0
diff --git a/meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.service b/meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.service
index 0bdf6c1..65b99e7 100644
--- a/meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.service
+++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=Launch default realm
 ConditionPathExists=!/run/realms
+ConditionPathExists=/realms/default.realm
+
 
 [Service]
 ExecStart=/usr/bin/realms start