From d7392f65765927e316f8df603340069a975104bb Mon Sep 17 00:00:00 2001
From: Adam Boardman <adamboardman@gmail.com>
Date: Mon, 4 Jan 2021 16:35:19 +0000
Subject: [PATCH] Migrated to lxc-android, gemian-system, stopped persistent
 journaling and removed root password setting (use sudo)

---
 cosmopda.yaml      |  7 +++----
 gemian-common.yaml | 10 +++++++++-
 geminipda.yaml     |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/cosmopda.yaml b/cosmopda.yaml
index f048f85..86c555f 100644
--- a/cosmopda.yaml
+++ b/cosmopda.yaml
@@ -20,7 +20,7 @@ actions:
 
   - action: apt
     description: Installing Cosmo Communicator-specific packages
-    packages: [ droid-hal-cosmopda, bluebinder ]
+    packages: [ bluebinder ]
 
   - action: run
     description: Generate /usr/share/kernel/linux-boot.img for Cosmo Communicator
@@ -29,12 +29,11 @@ actions:
 
   - action: run
     chroot: true
-    command: echo cosmopda > /etc/hostname
+    command: echo cosmocom > /etc/hostname
 
   - action: run
     chroot: true
-    description: Setting password on root user (useful for testing, remove later)
-    command: echo root:root | chpasswd
+    command: echo "127.0.0.1	cosmocom" >> /etc/hosts
 
   - action: run
     chroot: true
diff --git a/gemian-common.yaml b/gemian-common.yaml
index 8995602..705e0f5 100644
--- a/gemian-common.yaml
+++ b/gemian-common.yaml
@@ -43,7 +43,10 @@ actions:
       - xkb-data
       - xserver-xorg-video-hwcomposer
       - xss-lock
-      - mobile-broadband-provider-info
+      - bash-completion
+      - system-image
+      - lxc-android
+      - locales
 
   - action: run
     chroot: true
@@ -64,3 +67,8 @@ actions:
     chroot: true
     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/
diff --git a/geminipda.yaml b/geminipda.yaml
index 4512c9f..4fdcf3f 100644
--- a/geminipda.yaml
+++ b/geminipda.yaml
@@ -14,7 +14,7 @@ actions:
 
   - action: apt
     description: Installing Gemini PDA-specific packages
-    packages: [ droid-hal-cosmopda gemian-system initramfs-tools-halium gemian-modular-kernel ]
+    packages: [ droid-hal-cosmopda initramfs-tools-halium gemian-modular-kernel ]
 
   - action: run
     chroot: true