calamares related fixes

2020.1/aims-live/aims-live-2020/calamares/modules/luksopenswaphookcfg.conf

+# Writes an openswap configuration with LUKS settings to the given path
+---
+# Path of the configuration file to write (in the target system)
+configFilePath: /etc/openswap.conf

2020.1/aims-live/aims-live-2020/calamares/modules/machineid.conf

+---
+# Whether to create /etc/machine-id for systemd.
+systemd: true
+# Whether to create /var/lib/dbus/machine-id for D-Bus.
+dbus: true
+# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
+# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
+symlink: true

2020.1/aims-live/aims-live-2020/calamares/modules/mount.conf

+# Mount filesystems in the target (generally, before treating the
+# target as a usable chroot / "live" system). Filesystems are
+# automatically mounted from the partitioning module. Filesystems
+# listed here are **extra**. The filesystems listed in *extraMounts*
+# are mounted in all target systems. The filesystems listed in
+# *extraMountsEfi* are mounted in the target system **only** if
+# the host machine uses UEFI.
+---
+# Extra filesystems to mount. The key's value is a list of entries; each
+# entry has four keys:
+#   - device    The device node to mount
+#   - fs        The filesystem type to use
+#   - mountPoint Where to mount the filesystem
+#   - options (optional) Extra options to pass to mount(8)
+#
+extraMounts:
+    - device: proc
+      fs: proc
+      mountPoint: /proc
+    - device: sys
+      fs: sysfs
+      mountPoint: /sys
+    - device: /dev
+      mountPoint: /dev
+      options: bind
+    - device: tmpfs
+      fs: tmpfs
+      mountPoint: /run
+    - device: /run/udev
+      mountPoint: /run/udev
+      options: bind
+
+extraMountsEfi:
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars

2020.1/aims-live/aims-live-2020/calamares/modules/unpackfs.conf

 ---
 unpack:
-    -   source: "/lib/live/mount/medium/live/filesystem.squashfs"
+    -   source: "/run/live/medium/live/filesystem.squashfs"
         sourcefs: "squashfs"
         destination: ""

2020.1/aims-live/aims-live-2020/calamares/scripts/mount-media-chroot

@@ -2,7 +2,7 @@
 # This script runs on the live media, ie. outside of the chroot environment.
 
 # debian-live ensures that this is always at the same place, so we can just bind-mount it
-MEDIA="/lib/live/mount/medium"
+MEDIA="/run/live/medium"
 
 # More tricky, we need to figure out where calamares left us the chroot.
 # This seems to work reliably in all tested cases.

2020.1/aims-live/aims-live-2020/calamares/scripts/sources-final

@@ -6,24 +6,24 @@ cat <<EOF > $CHROOT/etc/apt/sources.list
 ## Debian
 
 # Main
-deb http://deb.debian.org/debian stretch main
-#deb-src http://deb.debian.org/debian stretch main
+deb http://deb.debian.org/debian buster main
+#deb-src http://deb.debian.org/debian buster main
 
 # Updates
-deb http://deb.debian.org/debian stretch-updates main
-#deb-src http://deb.debian.org/debian stretch-updates main
+deb http://deb.debian.org/debian buster-updates main
+#deb-src http://deb.debian.org/debian buster-updates main
 
 # Backports (cherrypick only!)
-deb http://deb.debian.org/debian stretch-backports main
-#deb-src http://deb.debian.org/debian stretch-backports main
+deb http://deb.debian.org/debian buster-backports main
+#deb-src http://deb.debian.org/debian buster-backports main
 
 # Security (unattended upgrades)
-deb http://security.debian.org/ stretch/updates main
-#deb-src http://security.debian.org/ stretch/updates main
+deb http://security.debian.org/ buster/updates main
+#deb-src http://security.debian.org/ buster/updates main
 
 
 ## AIMS Desktop
 
-deb http://ppa.aims.ac.za/aims-ppa stretch main restricted
-#deb-src http://ppa.aims.ac.za/aims-ppa stretch main restricted
+deb http://ppa.aims.ac.za/aims-ppa buster main restricted
+#deb-src http://ppa.aims.ac.za/aims-ppa buster main restricted
 EOF

2020.1/aims-live/aims-live-2020/calamares/scripts/unmount-media-chroot

@@ -2,7 +2,7 @@
 # This script runs on the live media, ie. outside of the chroot environment.
 
 # debian-live ensures that this is always at the same place, so we can just bind-mount it
-MEDIA="/lib/live/mount/medium"
+MEDIA="/run/live/medium"
 
 # More tricky, we need to figure out where calamares left us the chroot.
 # This seems to work reliably in all tested cases.

2020.1/aims-live/aims-live-2020/calamares/settings-debian.conf

+# Configuration file for Calamares
+# Syntax is YAML 1.2
+---
+
+# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
+modules-search: [ local, /usr/lib/calamares/modules ]
+
+sequence:
+
+# Phase 1 - prepare.
+# View modules are shown as UI pages, jobs from job modules
+# are executed immediately in the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+- show:
+  - welcome
+  - locale
+  - keyboard
+  - partition
+  - users
+  - summary
+
+# Phase 2 - install.
+# View modules are not shown. Only the view modules shown
+# in the previous phase are allowed, their names should be
+# added here as placeholders to specify the order in which
+# view module jobs should be enqueued. Job modules are
+# also allowed.
+- exec:
+  - partition
+  - mount
+  - unpackfs
+  - sources-media 
+  - machineid
+  - fstab
+  - locale
+  - keyboard
+  - localecfg
+  - users
+  - networkcfg
+  - hwclock
+  - services-systemd
+  - bootloader-config
+  - grubcfg
+  - bootloader
+  - packages
+  - luksbootkeyfile
+  - luksopenswaphookcfg
+  - initramfscfg
+  - initramfs
+  - sources-media-unmount
+  - sources-final
+  - umount
+
+# Phase 3 - postinstall.
+# View modules are shown as UI pages, jobs from job modules are
+# executed immediately in the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+- show:
+  - finished
+
+# A branding component is a directory, either in
+# SHARE/calamares/branding or in /etc/calamares/branding
+# (the latter takes precedence). The directory must contain a
+# YAML file branding.desc which may reference additional resources
+# (such as images) as paths relative to the current directory.
+# Only the name of the branding component (directory) should be
+# specified here, Calamares then takes care of finding it and
+# loading the contents.
+branding: debian

2020.1/aims-live/aims-live-2020/calamares/settings.conf

@@ -4,7 +4,7 @@
 # Modules can be job modules (with different interfaces) and QtWidgets view modules.
 # They could all be placed in a number of different paths.
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
-modules-search: [ local ]
+modules-search: [ local, /usr/lib/calamares/modules ]
 
 # We define the module names in the order they should show up (QtWidget view modules,
 # with one or more pages) OR be executed if enqueued (all other modules).
@@ -46,7 +46,7 @@ sequence:
   - users
   - networkcfg
   - hwclock
-  - services
+  - services-systemd
   - unmount-media-chroot
   - sources-final
   - packages

2020.1/aims-live/aims-live-2020/debian/.debhelper/generated/aims-live/installed-by-dh_install

+./artwork/install-aims-desktop.png
+./calamares
+./calamares/scripts/bootloader-eficonfig
+./calamares/scripts/mount-media-chroot
+./calamares/scripts/sources-final
+./calamares/scripts/sources-installtime
+./calamares/scripts/unmount-media-chroot
+./calamares/scripts/enable-locales
+./calamares/bootloader-eficonfig
+./calamares/mount-media-chroot
+./calamares/sources-final
+./calamares/sources-installtime
+./calamares/unmount-media-chroot
+./calamares/enable-locales
+./conf/gsettings/96_aims-desktop-live.gschema.override
+./install-aims-desktop.desktop

2020.1/aims-live/aims-live-2020/debian/aims-live/DEBIAN/conffiles

+/etc/calamares/bootloader-eficonfig/module.desc
+/etc/calamares/branding/aimsdesktop/aimsdesktop.png
+/etc/calamares/branding/aimsdesktop/branding.desc
+/etc/calamares/branding/aimsdesktop/languages.png
+/etc/calamares/branding/aimsdesktop/show.qml
+/etc/calamares/branding/aimsdesktop/slide1.png
+/etc/calamares/enable-locales/module.desc
+/etc/calamares/modules/finished.conf
+/etc/calamares/modules/fstab.conf
+/etc/calamares/modules/locale.conf
+/etc/calamares/modules/netinstall.conf
+/etc/calamares/modules/packages.conf
+/etc/calamares/modules/partition.conf
+/etc/calamares/modules/unpackfs.conf
+/etc/calamares/modules/users.conf
+/etc/calamares/modules/webview.conf
+/etc/calamares/modules/welcome.conf
+/etc/calamares/mount-media-chroot/module.desc
+/etc/calamares/scripts/bootloader-eficonfig
+/etc/calamares/scripts/enable-locales
+/etc/calamares/scripts/mount-media-chroot
+/etc/calamares/scripts/sources-final
+/etc/calamares/scripts/sources-installtime
+/etc/calamares/scripts/unmount-media-chroot
+/etc/calamares/settings.conf
+/etc/calamares/sources-final/module.desc
+/etc/calamares/sources-installtime/module.desc
+/etc/calamares/unmount-media-chroot/module.desc

2020.1/aims-live/aims-live-2020/debian/aims-live/DEBIAN/control

+Package: aims-live
+Version: 2020.1
+Architecture: all
+Maintainer: Jonathan Carter <jonathan@aims.ac.za>
+            Jan Groenewald <jan@aims.ac.za>
+Installed-Size: 216
+Depends: calamares, hashcheck, live-boot, live-boot-initramfs-tools, live-config, live-config-systemd, live-tools, qml-module-qtquick-window2, qml-module-qtquick2, user-setup, xserver-xorg-legacy, md5sumchecker, dconf-gsettings-backend | gsettings-backend
+Conflicts: antiword, catdoc, cups-browsed, cython-doc, docbook-dsssl, docutils-doc, ecl-doc, fckeditor, fflas-ffpack-dev-doc, fflas-ffpack-user-doc, gmp-doc, httpd-cgi, libgmp10-doc, libmpfi-doc, libmpfr-dev, mercurial, nauty-doc, pari-galpol, pari-gp2c, python-4suite-xml, python-attr-doc, python-cairocffi, python-configobj, python-cycler-doc, python-cysignals-doc, python-flask-autoindex-doc, python-flask-babel-doc, python-flask-doc, python-flask-openid-doc, python-flask-silk-doc, python-flup, python-fpylll-doc, python-gd-dbg, python-gdchart, python-genshi, python-glade2, python-greenlet, python-ldap, python-manuel, python-matplotlib-doc, python-memcache, python-mpmath-doc, python-mysqldb, python-networkx-doc, python-nose, python-pam, python-ply-doc, python-pydot, python-pylibmc, python-pyparsing-doc, python-pyxmpp, python-qt3, python-qt4, python-redis, python-rpy-docs, python-scipy-doc, python-serial, python-sip, python-sphinx-rtd-theme, python-stemmer, python-traits, python-twisted-bin-dbg, python-werkzeug-doc, python-wxgtk3.0, python-xml, python-zope.testing, sagetex-doc, singular-dev-doc, slime, sphinx-doc, sqlite3-doc, symmetrica-doc, tachyon-doc, texlive-fonts-extra-doc, texlive-latex-base-doc, texlive-latex-extra-doc, texlive-latex-recommended-doc, texlive-pictures-doc, texlive-pstricks-doc, texlive-publishers-doc, texlive-science-doc
+Section: gnome
+Priority: optional
+Homepage: https://desktop.aims.ac.za
+Description: AIMS Desktop live system
+ This package is intended for use on AIMS Desktop live media.
+ .
+ This is used on live CD and USB images and is not intended for
+ installation on normal systems.

2020.1/aims-live/aims-live-2020/debian/aims-live/DEBIAN/md5sums

+1afefa3ab7588c5f84acceb77926d296  usr/lib/calamares/modules/bootloader-eficonfig/module.desc
+7adacbd9d6a2b94e1e7ff35120e3340e  usr/lib/calamares/modules/enable-locales/module.desc
+cfe04b8d3dc177631e1c8ca3d9f15b44  usr/lib/calamares/modules/mount-media-chroot/module.desc
+d7ff8b34bf24e5ffc02325c12d0c0556  usr/lib/calamares/modules/sources-final/module.desc
+3eadea9ee31ecf977d18e1eedb442972  usr/lib/calamares/modules/sources-installtime/module.desc
+da7e8c307c37dd1a92c8cd57692ddf80  usr/lib/calamares/modules/unmount-media-chroot/module.desc
+56560642d9d9406de52c3b436f4bfae8  usr/sbin/bootloader-eficonfig
+c72e4cd93838046cb1993a0e7348f5a6  usr/sbin/enable-locales
+650bbb048010c5442d35312196551e0e  usr/sbin/mount-media-chroot
+b00967c04003d44f86cabb89d325287c  usr/sbin/sources-final
+c253e89eb9a34ef1431515a63f7b4ea7  usr/sbin/sources-installtime
+ab3179cb9bcb22bc1dd60dfdbabbf3de  usr/sbin/unmount-media-chroot
+5714184e5b32e56637813b80281ca43f  usr/share/applications/install-aims-desktop.desktop
+c27264a67a678d4030741bc97394bb07  usr/share/doc/aims-live/changelog.gz
+cb4a9446c23a660a4d8ef498074a193b  usr/share/doc/aims-live/copyright
+0768e481533b432cb00be1223d8d6e35  usr/share/glib-2.0/schemas/96_aims-desktop-live.gschema.override
+2b20854043cb31039d7f9da5d1473466  usr/share/pixmaps/install-aims-desktop.png

2020.1/aims-live/aims-live-2020/debian/aims-live/DEBIAN/postrm

+#!/bin/sh
+
+# Generate unique IDs for this machine:
+dbus-uuidgen --ensure
+systemd-machine-id-setup
+
+# Ping must me set suid, which we lost with squashfs extraction
+chmod +s /bin/ping
+
+# Set root filesystem persmissions correctly
+chmod 0755 /
+
+case "$1" in
+    remove)
+        # Restore original Calamares icon
+        dpkg-divert --quiet --rename --package aims-live \
+                   --remove /usr/share/applications/calamares.desktop
+    ;;
+esac
+
+exit 0

2020.1/aims-live/aims-live-2020/debian/aims-live/DEBIAN/preinst

+#!/bin/sh
+set -e
+
+case "$1" in
+    install|upgrade)
+        cleanup_and_divert() {
+            # Play it safe because diverts can go wrong 
+            if [ -f $1.orig ]; then
+                mv $1.orig $1
+            fi
+            dpkg-divert --quiet --package aims-live \
+		        --divert $1.orig --rename $1
+        }
+
+        # Calamares .desktop file
+        cleanup_and_divert /usr/share/applications/calamares.desktop
+    ;;
+esac
+
+

2020.1/aims-live/aims-live-2020/debian/aims-live/etc/calamares/bootloader-eficonfig/module.desc

+---
+type:       "job"
+name:       "bootloader-eficonfig"
+interface:  "process"
+command:    "/usr/sbin/bootloader-eficonfig"
+timeout:    600

2020.1/aims-live/aims-live-2020/debian/aims-live/etc/calamares/branding/aimsdesktop/branding.desc

+---
+componentName:   aimsdesktop
+
+strings:
+    productName:         AIMS Desktop
+    shortProductName:    AIMS Desktop
+    version:             2018.1
+    shortVersion:        2018.1
+    versionedName:       AIMS Desktop 2018.1
+    shortVersionedName:  AIMS Desktop 2018.1
+    bootloaderEntryName: AIMS Desktop
+    productUrl:          https://aims.ac.za
+    supportUrl:          https://help.aims.ac.za
+    knownIssuesUrl:      https://help.aims.ac.za
+    releaseNotesUrl:     https://help.aims.ac.za
+
+images:
+    productLogo:         "aimsdesktop.png"
+    productIcon:         "aimsdesktop.png"
+    productWelcome:      "languages.png"
+
+slideshow:               "show.qml"
+
+style:
+   sidebarBackground:    "#2f343f"
+   sidebarText:          "#FFFFFF"
+   sidebarTextSelect:    "#093c7c"