From 144cc1c4def17a0668f1279c441d3bfc52008952 Mon Sep 17 00:00:00 2001
From: NeKit <nekit1000@gmail.com>
Date: Fri, 1 Nov 2019 12:02:09 +0100
Subject: [PATCH] Add variants to cosmopda.yaml

---
 cosmopda.yaml | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/cosmopda.yaml b/cosmopda.yaml
index ff358cc..49b755c 100644
--- a/cosmopda.yaml
+++ b/cosmopda.yaml
@@ -1,4 +1,6 @@
 {{- $image := or .image "gemian-cosmopda.tgz" -}}
+{{- $output := or .output "tarball" -}}
+{{- $variant := or .variant "mate" -}}
 
 architecture: arm64
 
@@ -29,13 +31,52 @@ actions:
     description: Setting password on root user (useful for testing, remove later)
     command: echo root:root | chpasswd
 
+{{ if eq $variant "lxqt" }}
+  - action: apt
+    description: Installing LXQt desktop environment
+    packages:
+      - lxdm
+      - lxqt
+      - breeze-icon-theme
+      - xserver-xorg
+      - xserver-xorg-input-evdev
+{{ end }}
+
+{{ if eq $variant "mate" }}
   - action: apt
     description: Installing MATE desktop environment
     packages:
-      - lightdm
+      - lxdm
       - mate-desktop-environment
       - xserver-xorg
+      - xserver-xorg-input-evdev
+{{ end }}
 
+  - action: run
+    chroot: true
+    description: Fix default DPI
+    command: sed -e "s@\\[server\\]@[server]\\narg=/usr/bin/Xorg -dpi 192\n@" -i /etc/lxdm/lxdm.conf
+
+  - action: run
+    chroot: true
+    description: Removing xserver-xorg-input-libinput as it does not work with touchscreen yet
+    command: apt remove xserver-xorg-input-libinput
+
+{{ if eq $output "tarball" }}
   - action: pack
     file: {{ $image }}
     compression: gz
+{{ end }}
+
+{{ if eq $output "image" }}
+  - action: image-file
+    imagename: {{ $image }}
+    imagesize: 3G
+    fs: ext4
+    fsname: "gemian"
+
+  - action: filesystem-deploy
+    setup-fstab: false
+    setup-kernel-cmdline: false
+    description: Deploying filesystem onto image
+{{ end }}