From adae0066aec7fa28d8e5839bec288ed1e60b5fe9 Mon Sep 17 00:00:00 2001
From: WeirdTreeThing <bradyn127@protonmail.com>
Date: Mon, 11 Dec 2023 19:41:26 -0500
Subject: [PATCH] Update chromebook stuff

---
 katsu/modules/chromebook/base-cbe.yaml        | 43 +++++++++
 ...isk-x86_64.yaml => base-disk-aarch64.yaml} | 20 +++--
 .../chromebook/base-disk-cbe-x86_64.yaml      | 42 +++++++++
 katsu/modules/chromebook/base-disk.yaml       | 58 -------------
 katsu/modules/chromebook/base.yaml            | 87 -------------------
 katsu/modules/chromebook/buildstamp.sh        | 25 ------
 katsu/modules/chromebook/cleanup.sh           | 22 -----
 katsu/modules/chromebook/grub-setup.sh        | 39 ---------
 katsu/modules/chromebook/live-cbe.yaml        | 72 +++++++++++++++
 .../repodir/fedora-cisco-openh264.repo        | 22 -----
 .../chromebook/repodir/fedora-updates.repo    | 36 --------
 katsu/modules/chromebook/repodir/fedora.repo  | 36 --------
 .../repodir/rpmfusion-free-tainted.repo       | 33 -------
 .../repodir/rpmfusion-free-updates.repo       | 31 -------
 .../chromebook/repodir/rpmfusion-free.repo    | 33 -------
 .../repodir/rpmfusion-nonfree-tainted.repo    | 33 -------
 .../repodir/rpmfusion-nonfree-updates.repo    | 31 -------
 .../chromebook/repodir/rpmfusion-nonfree.repo | 34 --------
 katsu/modules/chromebook/repodir/terra.repo   | 11 ---
 .../chromebook/repodir/ultramarine.repo       | 11 ---
 katsu/modules/chromebook/selinux.sh           |  6 --
 katsu/modules/chromebook/submarine.sh         | 18 ++++
 .../modules/flagship/flagship-chromebook.yaml | 20 ++---
 katsu/modules/gnome/gnome-chromebook.yaml     | 22 ++---
 katsu/modules/kde/kde-chromebook.yaml         | 14 +--
 .../modules/pantheon/pantheon-chromebook.yaml | 44 +++++++---
 26 files changed, 244 insertions(+), 599 deletions(-)
 create mode 100644 katsu/modules/chromebook/base-cbe.yaml
 rename katsu/modules/chromebook/{base-disk-x86_64.yaml => base-disk-aarch64.yaml} (65%)
 create mode 100644 katsu/modules/chromebook/base-disk-cbe-x86_64.yaml
 delete mode 100644 katsu/modules/chromebook/base-disk.yaml
 delete mode 100644 katsu/modules/chromebook/base.yaml
 delete mode 100644 katsu/modules/chromebook/buildstamp.sh
 delete mode 100644 katsu/modules/chromebook/cleanup.sh
 delete mode 100644 katsu/modules/chromebook/grub-setup.sh
 create mode 100644 katsu/modules/chromebook/live-cbe.yaml
 delete mode 100644 katsu/modules/chromebook/repodir/fedora-cisco-openh264.repo
 delete mode 100644 katsu/modules/chromebook/repodir/fedora-updates.repo
 delete mode 100644 katsu/modules/chromebook/repodir/fedora.repo
 delete mode 100644 katsu/modules/chromebook/repodir/rpmfusion-free-tainted.repo
 delete mode 100644 katsu/modules/chromebook/repodir/rpmfusion-free-updates.repo
 delete mode 100644 katsu/modules/chromebook/repodir/rpmfusion-free.repo
 delete mode 100644 katsu/modules/chromebook/repodir/rpmfusion-nonfree-tainted.repo
 delete mode 100644 katsu/modules/chromebook/repodir/rpmfusion-nonfree-updates.repo
 delete mode 100644 katsu/modules/chromebook/repodir/rpmfusion-nonfree.repo
 delete mode 100644 katsu/modules/chromebook/repodir/terra.repo
 delete mode 100644 katsu/modules/chromebook/repodir/ultramarine.repo
 delete mode 100644 katsu/modules/chromebook/selinux.sh
 create mode 100644 katsu/modules/chromebook/submarine.sh

diff --git a/katsu/modules/chromebook/base-cbe.yaml b/katsu/modules/chromebook/base-cbe.yaml
new file mode 100644
index 0000000..d9d8426
--- /dev/null
+++ b/katsu/modules/chromebook/base-cbe.yaml
@@ -0,0 +1,43 @@
+scripts:
+  post:
+    - id: cleanup
+      name: Clean up system
+      file: ../base/cleanup.sh
+    - id: selinux-setup
+      name: Set up SELinux
+      file: ../base/selinux.sh
+    - id: buildstamp
+      name: Generate buildstamp
+      file: ../base/buildstamp.sh
+    - id: submarine
+      name: Set up ChromeOS bootloader
+      file: submarine.sh
+
+dnf:
+  releasever: 39
+  repodir: ../base/repodir
+  options:
+    - --setopt=cachedir=/var/cache/dnf
+    - --nogpgcheck
+    - --setopt=keepcache=True
+    - --best
+    - --allowerasing
+  exclude:
+    - fedora-release*
+    - generic-release*
+    - kernel-debug*
+    - setroubleshoot
+    - setroubleshoot-plugins
+    - setroubleshoot-server
+  arch_packages:
+    aarch64:
+      - bcm283x-firmware
+      - bcm283x-overlays
+      - "@arm-tools"
+    x86_64:
+      - grub2-pc
+      - grub2-pc-modules
+  packages:
+    - depthcharge-tools
+    - alsa-ucm-cros
+    # - submarine
diff --git a/katsu/modules/chromebook/base-disk-x86_64.yaml b/katsu/modules/chromebook/base-disk-aarch64.yaml
similarity index 65%
rename from katsu/modules/chromebook/base-disk-x86_64.yaml
rename to katsu/modules/chromebook/base-disk-aarch64.yaml
index 2052940..346777f 100644
--- a/katsu/modules/chromebook/base-disk-x86_64.yaml
+++ b/katsu/modules/chromebook/base-disk-aarch64.yaml
@@ -1,13 +1,14 @@
 builder: dnf
-distro: Ultramarine Linux 39 Chromebook Edition
+distro: Ultramarine Linux 39
 
 users:
-  - username: neko
+  - username: ultramarine
     # plaintext password: ultramarine
     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
     groups:
       - wheel
 
+
 import:
   - base.yaml
   - base-disk.yaml
@@ -19,17 +20,24 @@ scripts:
       file: grub-setup.sh
 
 disk:
-  size: 5GiB
+  size: 8GiB
   partitions:
-    - label: Kernel
+    - label: EFI
       size: 512MiB
       filesystem: efi
-      mountpoint:
+      mountpoint: /boot/efi
 
     - label: boot
-      size: 4GiB
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
       filesystem: ext4
       mountpoint: /
 
+
 dnf:
   releasever: 39
+  arch: aarch64
\ No newline at end of file
diff --git a/katsu/modules/chromebook/base-disk-cbe-x86_64.yaml b/katsu/modules/chromebook/base-disk-cbe-x86_64.yaml
new file mode 100644
index 0000000..4dfff26
--- /dev/null
+++ b/katsu/modules/chromebook/base-disk-cbe-x86_64.yaml
@@ -0,0 +1,42 @@
+builder: dnf
+distro: Ultramarine Linux CBE 39
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+
+import:
+  - base-cbe.yaml
+  - ../base/base-disk.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 14GiB
+  partitions:
+    - label: submarine
+      size: 16MiB
+      filesystem: efi
+      mountpoint: /mnt
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+
+dnf:
+  releasever: 39
diff --git a/katsu/modules/chromebook/base-disk.yaml b/katsu/modules/chromebook/base-disk.yaml
deleted file mode 100644
index 3273bbb..0000000
--- a/katsu/modules/chromebook/base-disk.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-builder: dnf
-
-dnf:
-  releasever: 39
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --nogpgcheck
-    - --setopt=keepcache=True
-  exclude:
-    - fedora-release*
-    - generic-release*
-  packages:
-    - filesystem
-    - setup
-    - lvm2
-    - btrfs-progs
-    - dmraid
-    - nvme-cli
-    - kernel
-    - glibc
-    - glibc-common
-    - dracut-config-generic
-    - dracut-tools
-    - dnf
-    - dracut
-    # - mkpasswd # maybe not needed soon
-    - "@core"
-    - "@standard"
-    - grub2-tools
-    - "@hardware-support"
-    - NetworkManager
-    - rpm
-    - libgomp
-    # - ultramarine-release-identity-basic
-    # - ultramarine-release-basic
-    - fedora-repos
-    - efibootmgr
-    - dracut-live
-    - dracut-network
-
-  arch_packages:
-    aarch64:
-      - grub2-efi-aa64
-      - grub2-efi-aa64-modules
-      - grub2-efi-aa64-cdboot
-      - shim-aa64
-      - shim-unsigned-aarch64
-      - bcm283x-firmware
-      - bcm283x-overlays
-      - "@arm-tools"
-    x86_64:
-      - grub2-efi-x64
-      - grub2-efi-x64-modules
-      - grub2-efi-x64-cdboot
-      - grub2-pc
-      - grub2-pc-modules
-      - shim-x64
-      - shim-unsigned-x64
diff --git a/katsu/modules/chromebook/base.yaml b/katsu/modules/chromebook/base.yaml
deleted file mode 100644
index 43b400f..0000000
--- a/katsu/modules/chromebook/base.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-import:
-  - base-disk.yaml
-  # because no one managed figure out they had to import
-  # this one module for the packages...
-scripts:
-  post:
-    - id: cleanup
-      name: Clean up system
-      file: cleanup.sh
-    - id: selinux-setup
-      name: Set up SELinux
-      file: selinux.sh
-    - id: buildstamp
-      name: Generate buildstamp
-      file: buildstamp.sh
-
-dnf:
-  releasever: 39
-  repodir: repodir
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --nogpgcheck
-    - --setopt=keepcache=True
-    - --best
-    - --allowerasing
-  exclude:
-    - fedora-release*
-    - generic-release*
-    - kernel-debug*
-    - setroubleshoot
-    - setroubleshoot-plugins
-    - setroubleshoot-server
-  packages:
-    - dracut-live
-    - dracut-network
-
-#   packages:
-#     - filesystem
-#     - setup
-#     - lvm2
-#     - btrfs-progs
-#     - dmraid
-#     - nvme-cli
-#     - kernel
-#     - kernel-devel
-#     - kernel-modules
-#     - kernel-core
-#     - glibc
-#     - glibc-common
-#     - dracut-config-generic
-#     - dracut-tools
-#     - dnf
-#     - dracut
-#     - "@core"
-#     - grub2-tools
-#     - "@hardware-support"
-#     - NetworkManager
-#     - rpm
-#     - libgomp
-#     # - ultramarine-release-identity-basic
-#     # - ultramarine-release-basic
-#     - fedora-repos
-#     - efibootmgr
-#     - ultramarine-release-common
-#     - ultramarine-release
-#     - ultramarine-repos
-#     - "ultramarine-logos*"
-
-#   arch_packages:
-#     aarch64:
-#       - grub2-efi-aa64
-#       - grub2-efi-aa64-modules
-#       - grub2-efi-aa64-cdboot
-#       - shim-aa64
-#       - shim-unsigned-aarch64
-#       - bcm283x-firmware
-#       - bcm283x-overlays
-#       - "@arm-tools"
-#     x86_64:
-#       - grub2-efi-x64
-#       - grub2-efi-x64-modules
-#       - grub2-efi-x64-cdboot
-#       - grub2-pc
-#       - grub2-pc-modules
-#       - shim-x64
-#       - shim-unsigned-x64
diff --git a/katsu/modules/chromebook/buildstamp.sh b/katsu/modules/chromebook/buildstamp.sh
deleted file mode 100644
index 1a9d901..0000000
--- a/katsu/modules/chromebook/buildstamp.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -x
-
-# get data from /etc/os-release
-
-source /etc/os-release
-
-
-# get date in form of example 202112022224
-DATE=$(date +%Y%m%d%H%M)
-
-UUID="${DATE}.$(uname -m)"
-
-# Inject a dummy .buildstamp so Anaconda doesn't complain
-cat << EOF > /.buildstamp
-[Main]
-Product=${NAME}
-Version=${VERSION}
-OnChromebook=true
-BugURL=${BUG_REPORT_URL}
-IsFinal=true
-UUID=$UUID
-Variant=${VARIANT_ID}
-[Compose]
-Katsu=0.1
-EOF
diff --git a/katsu/modules/chromebook/cleanup.sh b/katsu/modules/chromebook/cleanup.sh
deleted file mode 100644
index 249c5cf..0000000
--- a/katsu/modules/chromebook/cleanup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -x
-
-systemctl disable systemd-networkd-wait-online systemd-networkd systemd-networkd.socket
-systemctl disable chronyd
-# systemctl disable polkit
-# Add polkitd user manually, weird hack because preinstall script doesn't run
-cat << EOF > /usr/lib/sysusers.d/extras.conf
-# This is a really weird hack
-#Type  Name    ID   Argument
-g      polkitd 114  
-u      polkitd 114:114 "User for polkitd" - -
-
-g      rpc     32
-u      rpc     32:32  "Rpcbind Daemon" - -
-EOF
-
-echo max_parallel_downloads=20 >> /etc/dnf/dnf.conf
-echo defaultyes=True >> /etc/dnf/dnf.conf
-
-systemd-sysusers
-
-
diff --git a/katsu/modules/chromebook/grub-setup.sh b/katsu/modules/chromebook/grub-setup.sh
deleted file mode 100644
index 368f89b..0000000
--- a/katsu/modules/chromebook/grub-setup.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-set -x
-# Disable os-prober for now
-
-echo "Disabling os-prober..."
-
-echo "GRUB_DISABLE_OS_PROBER=true" > /etc/default/grub
-grub2-mkconfig > /boot/grub2/grub.cfg
-rm /etc/default/grub
-
-
-# get /dev/ of /boot, or / if /boot is not a separate partition
-function find_bootdev {
-    # try findmnt /boot
-    if findmnt -n -o SOURCE /boot; then
-        bootdev=$(findmnt -n -o SOURCE /boot)
-    else
-        bootdev=$(findmnt -n -o SOURCE /)
-    fi
-}
-
-
-find_bootdev
-# get blkid of /boot
-bootid=$(blkid -s UUID -o value $bootdev)
-
-cat << EOF > /boot/efi/EFI/fedora/grub.cfg
-search --no-floppy --fs-uuid --set=dev $bootid
-set prefix=(\$dev)/grub2
-
-export \$prefix
-configfile \$prefix/grub.cfg
-EOF
-
-# edit ro to rw in all entries
-
-sed -i 's/ ro  / rw  /g' /boot/loader/entries/*.conf
-
-dracut -vfN --add-drivers "virtio virtio_blk virtio_scsi xchi_pci mmc" --regenerate-all
\ No newline at end of file
diff --git a/katsu/modules/chromebook/live-cbe.yaml b/katsu/modules/chromebook/live-cbe.yaml
new file mode 100644
index 0000000..8ed3ccd
--- /dev/null
+++ b/katsu/modules/chromebook/live-cbe.yaml
@@ -0,0 +1,72 @@
+builder: dnf
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 14GiB
+  partitions:
+    - label: submarine
+      size: 16MiB
+      filesystem: efi
+      mountpoint: /mnt
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+
+dnf:
+  releasever: 39
+      - fcoe-utils
+    - device-mapper-multipath
+    - gnome-boxes
+    - deepin-wallpapers
+    - initial-setup-gui
+    - initial-setup
+  packages:
+    - python3-umstellar
+    - glibc-all-langpacks
+    - dracut-config-generic
+    - dracut-live
+    - dracut-config-generic
+    - dracut-network
+    - anaconda-dracut
+    - dracut-squash
+    - anaconda-live
+    - "@anaconda-tools"
+    - libblockdev-nvdimm
+    - isomd5sum
+    - orca
+    - espeak-ng
+    - speech-dispatcher-espeak-ng
+    - julietaula-montserrat-fonts
+    - ultramarine-backgrounds
+    - initscripts
+    - chkconfig
+    - gjs
+    - util-linux-user
+    - livesys-scripts
+    - rsync
+    - htop
+    - vim
+    - nano
+    # for drivers and other stuff
+    - kernel
+    - kernel-devel-matched
diff --git a/katsu/modules/chromebook/repodir/fedora-cisco-openh264.repo b/katsu/modules/chromebook/repodir/fedora-cisco-openh264.repo
deleted file mode 100644
index 02150d9..0000000
--- a/katsu/modules/chromebook/repodir/fedora-cisco-openh264.repo
+++ /dev/null
@@ -1,22 +0,0 @@
-[fedora-cisco-openh264]
-name=Fedora $releasever openh264 (From Cisco) - $basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
-type=rpm
-enabled=1
-metadata_expire=14d
-repo_gpgcheck=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=True
-
-[fedora-cisco-openh264-debuginfo]
-name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch
-type=rpm
-enabled=0
-metadata_expire=14d
-repo_gpgcheck=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=True
-
diff --git a/katsu/modules/chromebook/repodir/fedora-updates.repo b/katsu/modules/chromebook/repodir/fedora-updates.repo
deleted file mode 100644
index 9d9f2fd..0000000
--- a/katsu/modules/chromebook/repodir/fedora-updates.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=1
-countme=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/katsu/modules/chromebook/repodir/fedora.repo b/katsu/modules/chromebook/repodir/fedora.repo
deleted file mode 100644
index f9bfbb1..0000000
--- a/katsu/modules/chromebook/repodir/fedora.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-countme=1
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-debuginfo]
-name=Fedora $releasever - $basearch - Debug
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-source]
-name=Fedora $releasever - Source
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/katsu/modules/chromebook/repodir/rpmfusion-free-tainted.repo b/katsu/modules/chromebook/repodir/rpmfusion-free-tainted.repo
deleted file mode 100644
index 906bf6f..0000000
--- a/katsu/modules/chromebook/repodir/rpmfusion-free-tainted.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-free-tainted]
-name=RPM Fusion for Fedora $releasever - Free tainted
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
-enabled=1
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-tainted-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free tainted - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-tainted-source]
-name=RPM Fusion for Fedora $releasever - Free tainted - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir/rpmfusion-free-updates.repo b/katsu/modules/chromebook/repodir/rpmfusion-free-updates.repo
deleted file mode 100644
index 1405931..0000000
--- a/katsu/modules/chromebook/repodir/rpmfusion-free-updates.repo
+++ /dev/null
@@ -1,31 +0,0 @@
-[rpmfusion-free-updates]
-name=RPM Fusion for Fedora $releasever - Free - Updates
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-updates-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free - Updates Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-updates-source]
-name=RPM Fusion for Fedora $releasever - Free - Updates Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir/rpmfusion-free.repo b/katsu/modules/chromebook/repodir/rpmfusion-free.repo
deleted file mode 100644
index e65aa5b..0000000
--- a/katsu/modules/chromebook/repodir/rpmfusion-free.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-free]
-name=RPM Fusion for Fedora $releasever - Free
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
-enabled=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-source]
-name=RPM Fusion for Fedora $releasever - Free - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir/rpmfusion-nonfree-tainted.repo b/katsu/modules/chromebook/repodir/rpmfusion-nonfree-tainted.repo
deleted file mode 100644
index ee408aa..0000000
--- a/katsu/modules/chromebook/repodir/rpmfusion-nonfree-tainted.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-nonfree-tainted]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
-enabled=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-tainted-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-tainted-source]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir/rpmfusion-nonfree-updates.repo b/katsu/modules/chromebook/repodir/rpmfusion-nonfree-updates.repo
deleted file mode 100644
index 6d4d825..0000000
--- a/katsu/modules/chromebook/repodir/rpmfusion-nonfree-updates.repo
+++ /dev/null
@@ -1,31 +0,0 @@
-[rpmfusion-nonfree-updates]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-updates-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-updates-source]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir/rpmfusion-nonfree.repo b/katsu/modules/chromebook/repodir/rpmfusion-nonfree.repo
deleted file mode 100644
index dfb5110..0000000
--- a/katsu/modules/chromebook/repodir/rpmfusion-nonfree.repo
+++ /dev/null
@@ -1,34 +0,0 @@
-[rpmfusion-nonfree]
-name=RPM Fusion for Fedora $releasever - Nonfree
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-source]
-name=RPM Fusion for Fedora $releasever - Nonfree - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir/terra.repo b/katsu/modules/chromebook/repodir/terra.repo
deleted file mode 100644
index 1c61569..0000000
--- a/katsu/modules/chromebook/repodir/terra.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-[terra]
-name=Terra Packages $releasever
-baseurl=https://repos.fyralabs.com/terra$releasever
-metadata_expire=6h
-type=rpm
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
-repo_gpgcheck=1
-enabled=1
-enabled_metadata=1
\ No newline at end of file
diff --git a/katsu/modules/chromebook/repodir/ultramarine.repo b/katsu/modules/chromebook/repodir/ultramarine.repo
deleted file mode 100644
index 316c546..0000000
--- a/katsu/modules/chromebook/repodir/ultramarine.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-[ultramarine]
-name=Ultramarine Linux $releasever
-baseurl=https://repos.fyralabs.com/um$releasever
-metadata_expire=6h
-type=rpm
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://repos.fyralabs.com/um$releasever/key.asc
-repo_gpgcheck=1
-enabled=1
-enabled_metadata=1
\ No newline at end of file
diff --git a/katsu/modules/chromebook/selinux.sh b/katsu/modules/chromebook/selinux.sh
deleted file mode 100644
index f6d8a16..0000000
--- a/katsu/modules/chromebook/selinux.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -x
-
-echo "Setting up SELinux..."
-
-setfiles -F -e /proc -e /sys -e /dev -e /bin /etc/selinux/targeted/contexts/files/file_contexts / || true
-setfiles -F -e /proc -e /sys -e /dev /etc/selinux/targeted/contexts/files/file_contexts.bin /bin || true
diff --git a/katsu/modules/chromebook/submarine.sh b/katsu/modules/chromebook/submarine.sh
new file mode 100644
index 0000000..63a1ad7
--- /dev/null
+++ b/katsu/modules/chromebook/submarine.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -x
+
+# Find bootloader partition and umount
+blpart="$(findmnt -n -o SOURCE /mnt)"
+rootdev="$(basename `readlink -f "/sys/class/block/$(basename $blpart)/.."`)"
+partnum="$(echo $(basename $blpart) | sed 's/'"$rootdev"'//;s/p//')"
+umount $blpart
+
+# Remove /mnt from fstab
+sed -i '/mnt/d' /etc/fstab
+
+# Flash bootloader
+# dd if=/path/to/submarine.kpart of=$blpart
+cgpt add -i $partnum -t kernel -P 15 -T 1 -S 1 /dev/$rootdev
+
+# Workaround for katsu trying to unmount /mnt
+mount -o bind /mnt /mnt
diff --git a/katsu/modules/flagship/flagship-chromebook.yaml b/katsu/modules/flagship/flagship-chromebook.yaml
index 1359732..7e25b8f 100644
--- a/katsu/modules/flagship/flagship-chromebook.yaml
+++ b/katsu/modules/flagship/flagship-chromebook.yaml
@@ -1,21 +1,17 @@
 builder: dnf
 
 import:
-  - ../chromebook/base-disk.yaml
-  # - ../live/live.yaml
-  - ../chromebook/base-disk-x86_64.yaml
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
 
 distro: Ultramarine CBE Flagship 39
 
-out_file: ultramarine-cbe-flagship-39-live.iso
+out_file: ultramarine-cbe-flagship-39-live.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
-iso:
-  volume_id: UM-CBE-Fl
-
 dnf:
   releasever: 39
   # options:
@@ -26,8 +22,8 @@ dnf:
   packages:
     - "@ultramarine-flagship-product-environment"
 
-scripts:
-  post:
-    - id: flagship-chromebook
-      name: Set up Flagship Chromebook Live
-      file: ./flagship-live.sh
+#scripts:
+#  post:
+#    - id: flagship-live
+#      name: Set up Flagship Live
+#      file: ./flagship-live.sh
diff --git a/katsu/modules/gnome/gnome-chromebook.yaml b/katsu/modules/gnome/gnome-chromebook.yaml
index 7fe01e6..b3d4d61 100644
--- a/katsu/modules/gnome/gnome-chromebook.yaml
+++ b/katsu/modules/gnome/gnome-chromebook.yaml
@@ -1,15 +1,16 @@
 builder: dnf
 
 import:
-  - ../chromebook/base-disk.yaml
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
 
 out_file: ultramarine-cbe-gnome-39-live.iso
 
-scripts:
-  post:
-    -  #id: gnome-live
-      #name: Set up GNOME Live
-      #file: gnome-live.sh
+#  scripts:
+#  post:
+#    - id: gnome-live
+#      name: Set up GNOME Live
+#      file: gnome-live.sh
 
 distro: Ultramarine CBE GNOME 39
 
@@ -17,15 +18,14 @@ bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
-iso:
-  volume_id: UM-CBE-Gn
-
 dnf:
   releasever: 39
-  options:
-    - --setopt=strict=0
+  # options:
+  #   - --setopt=strict=0
   packages:
     - "@ultramarine-gnome-product-environment"
+    - ultramarine-release-gnome
+    - ultramarine-release-identity-gnome
 # scripts:
 #   post:
 #     - id: flagship-live
diff --git a/katsu/modules/kde/kde-chromebook.yaml b/katsu/modules/kde/kde-chromebook.yaml
index 82fd54d..af54078 100644
--- a/katsu/modules/kde/kde-chromebook.yaml
+++ b/katsu/modules/kde/kde-chromebook.yaml
@@ -1,25 +1,17 @@
 builder: dnf
 
 import:
-  - ../chromebook/base-disk.yaml
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
 
 distro: Ultramarine CBE KDE 39
 
-out_file: ultramarine-cbe-kde-39.iso
-
-scripts:
-  post:
-    #- id: kde-live
-    #  name: Set up KDE Live
-    #  file: ./kde-live.sh
+out_file: ultramarine-cbe-kde-39.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
-iso:
-  volume_id: UM-CBE-Kd
-
 dnf:
   releasever: 39
   # options:
diff --git a/katsu/modules/pantheon/pantheon-chromebook.yaml b/katsu/modules/pantheon/pantheon-chromebook.yaml
index 5a82b9b..3a4fc60 100644
--- a/katsu/modules/pantheon/pantheon-chromebook.yaml
+++ b/katsu/modules/pantheon/pantheon-chromebook.yaml
@@ -1,15 +1,16 @@
 builder: dnf
 
 import:
-  - ../chromebook/base-disk.yaml
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
 
-out_file: ultramarine-cbe-pantheon-39.iso
+out_file: ultramarine-cbe-pantheon-39-live.iso
 
-scripts:
-  post:
-    #- id: pantheon-live
-    #  name: Set up Pantheon Live
-    #  file: ./pantheon-live.sh
+#  scripts:
+#  post:
+#    - id: pantheon-live
+#      name: Set up Pantheon Live
+#      file: ./pantheon-live.sh
 
 distro: Ultramarine CBE Pantheon 39
 
@@ -17,15 +18,36 @@ bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
-iso:
-  volume_id: UM-CBE-Pa-Live
-
 dnf:
   releasever: 39
   options:
-    - --setopt=strict=0
+    - --setopt=strict=1
+  exclude:
+    - gnome-tour
+    - gnome-shell
+    - setroubleshoot
+  arch_exclude:
+    x86_64:
+      - elementary-calculator
+      - elementary-calendar
+      - elementary-capnet-assist
+      - elementary-camera
+      - elementary-mail
+      - elementary-music
+      - elementary-videos
+      - evince # yes, this application is shipped in appcenter
   packages:
     - "@ultramarine-pantheon-product-environment"
+    - elementary-greeter
+    - lightdm
+    - seahorse
+    - appcenter
+    - xdg-user-dirs-gtk
+    - xdg-desktop-portal-gtk
+    - xdg-desktop-portal-xapp
+    - ultramarine-backgrounds-gnome
+    - rsms-inter-fonts
+    - ultramarine-repos-appcenter
 # scripts:
 #   post:
 #     - id: flagship-live