From 378c3693122483fc60d8cc090dbd6a0dec08fa85 Mon Sep 17 00:00:00 2001
From: Adam Boardman <adamboardman@gmail.com>
Date: Sat, 16 Jan 2021 23:56:40 +0000
Subject: [PATCH] Adding lxcfs and uidmap as these are pulled in by apt on the
 command line but not when installed via debos Moved journal removal to later
 in the process as it was still present on the built image

---
 cosmopda.yaml      | 7 +++++++
 gemian-common.yaml | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cosmopda.yaml b/cosmopda.yaml
index b63d6f1..62fbf4b 100644
--- a/cosmopda.yaml
+++ b/cosmopda.yaml
@@ -26,6 +26,8 @@ actions:
       - media-hub
       - gemian-system
       - lxc-android
+      - lxcfs
+      - uidmap
       - cosmo-linux-kernel
 
   - action: run
@@ -81,6 +83,11 @@ actions:
     description: Removing xserver-xorg-input-libinput as it does not work with touchscreen yet
     command: apt remove xserver-xorg-input-libinput
 
+  - action: run
+    chroot: true
+    description: Removing /var/log/journal to avoid persisant journaling
+    command: rm -rf /var/log/journal/
+
 {{ if eq $output "tarball" }}
   - action: pack
     file: {{ $image }}
diff --git a/gemian-common.yaml b/gemian-common.yaml
index 08aa4b8..39b7d53 100644
--- a/gemian-common.yaml
+++ b/gemian-common.yaml
@@ -64,7 +64,3 @@ actions:
     description: Setting Gemian users
     script: scripts/setup-user.sh
 
-  - action: run
-    chroot: true
-    description: Removing /var/log/journal to avoid persisant journaling
-    command: rm -rf /var/log/journal/