README.md

@@ -1,3 +0,0 @@
-#### Config and theme for the Calamares installer on TileOS River edition
-
-Please report any issues with installation of TileOS River edition to this repo!

calamares/branding/tileos-river/branding.desc

@@ -6,12 +6,12 @@ windowSize:      "890px,600px"
 strings:
     productName:         TileOS
     shortProductName:    TileOS
-    version:             1.2 (t-rex)
+    version:             1.0 (t-rex)
-    shortVersion:        1.2
+    shortVersion:        1.0
-    versionedName:       TileOS 1.2 (t-rex)
+    versionedName:       TileOS 1.0 (t-rex)
-    shortVersionedName:  TileOS 1.2
+    shortVersionedName:  TileOS 1.0
     bootloaderEntryName: TileOS
-    supportUrl:          https://gitlab.com/tile-os/tileos/-/issues
+    supportUrl:          https://github.com/Tile-OS/TileOS/issues
 
 images:
     productLogo:         "tileos-logo.png"

calamares/branding/tileos-river/show.qml

@@ -25,60 +25,27 @@ Presentation
 
     Timer {
         interval: 20000
-        running: true
         repeat: true
         onTriggered: presentation.goToNextSlide()
     }
+
     Slide {
         Image {
-            anchors.centerIn: parent
+            id: background1
-            id: image1
+            source: "slide1.png"
-            x:0
+            width: 467; height: 280
-            y:0
-            width: 810
-            height: 485
             fillMode: Image.PreserveAspectFit
-            smooth: true
-            source: "River.png"
-        }
-    }
-    Slide {
-        Image {
             anchors.centerIn: parent
-            id: image2
+        }
-            x:0
+        Text {
-            y:0
+            anchors.horizontalCenter: background1.horizontalCenter
-            width: 810
+            anchors.top: background1.bottom
-            height: 485
+            text: qsTr("Welcome to TileOS 1.0 T-Rex.<br/>"+
-            fillMode: Image.PreserveAspectFit
+                  "The rest of the installation is automated and should complete in a few minutes.")
-            smooth: true
+            wrapMode: Text.WordWrap
-            source: "Features.png"
+            width: 600
-        }
+            horizontalAlignment: Text.Center
-    }
-    Slide {
-        Image {
-            anchors.centerIn: parent
-            id: image3
-            x:0
-            y:0
-            width: 810
-            height: 485
-            fillMode: Image.PreserveAspectFit
-            smooth: true
-            source: "Software.png"
-        }
-    }
-    Slide {
-        Image {
-            anchors.centerIn: parent
-            id: image4
-            x:0
-            y:0
-            width: 810
-            height: 485
-            fillMode: Image.PreserveAspectFit
-            smooth: true
-            source: "Follow.png"
         }
     }
+
 }

calamares/modules/fstab.conf

@@ -1,7 +1,7 @@
 ---
 mountOptions:
     default: defaults,noatime
-    btrfs: defaults,noatime,space_cache=v2,autodefrag
+    btrfs: defaults,noatime,space_cache,autodefrag
 ssdExtraMountOptions:
     ext4: discard
     jfs: discard

calamares/modules/mount.conf

@@ -34,7 +34,3 @@ extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
-      efi: true
-    - device: /dev/pts
-      mountPoint: /dev/pts
-      options: bind

calamares/modules/partition.conf

@@ -2,5 +2,7 @@ efiSystemPartition: "/boot/efi"
 enableLuksAutomatedPartitioning: true
 userSwapChoices:
     - none
+    - file
+initialSwapChoice: file
 drawNestedPartitions: true
 defaultFileSystemType: "ext4"

debian/changelog

@@ -1,51 +1,3 @@
-calamares-settings-tileos-river (1.17~tileos) unstable; urgency=medium
-
-  * Update version
-
- -- Aleksey Samoilov <samoilov.lex@gmail.com>  Sun, 20 Oct 2024 16:32:31 +0400
-
-calamares-settings-tileos-river (1.16~tileos) unstable; urgency=medium
-
-  * Update version
-
- -- Aleksey Samoilov <samoilov.lex@gmail.com>  Sat, 22 Jun 2024 18:04:03 +0400
-
-calamares-settings-tileos-river (1.15~tileos) unstable; urgency=medium
-
-  * Fix slideshow
-
- -- Aleksey Samoilov <samoilov.lex@gmail.com>  Tue, 02 Apr 2024 16:00:46 +0400
-
-calamares-settings-tileos-river (1.14~tileos) unstable; urgency=medium
-
-  * Fix mount
-
- -- Aleksey Samoilov <samoilov.lex@gmail.com>  Fri, 08 Mar 2024 21:37:21 +0400
-
-calamares-settings-tileos-river (1.13~tileos) unstable; urgency=medium
-
-  * Fix installing on Btrfs
-
- -- Aleksey Samoilov <samoilov.lex@gmail.com>  Fri, 08 Mar 2024 00:44:39 +0400
-
-calamares-settings-tileos-river (1.12~tileos) unstable; urgency=medium
-
-  * Backport some Debian stuff
-
- -- Aleksey Samoilov <samoilov.lex@gmail.com>  Thu, 07 Mar 2024 00:21:12 +0400
-
-calamares-settings-tileos-river (1.11~tileos) unstable; urgency=medium
-
-  * Fix slideshow
-
- -- Aleksey Samoilov <samoilov.lex@gmail.com>  Wed, 21 Feb 2024 23:53:31 +0400
-
-calamares-settings-tileos-river (1.10~tileos) unstable; urgency=medium
-
-  * Add slideshow
-
- -- Aleksey Samoilov <samoilov.lex@gmail.com>  Mon, 12 Feb 2024 00:14:29 +0400
-
 calamares-settings-tileos-river (1.9~tileos) unstable; urgency=medium
 
   * Fix branding path

scripts/bootloader-config

@@ -8,19 +8,14 @@ CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc
 # regenerating the initramfs right now:
 if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
     echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions
-    chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils
 fi
 
 echo "Running bootloader-config..."
 
 if [ -d /sys/firmware/efi/efivars ]; then
     echo " * Installing grub-efi (uefi)..."
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64 cryptsetup keyutils
 else
     echo " * install grub... (bios)"
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
 fi
-
-# Re-enable os-prober:
-sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by TileOS Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub
-chroot $CHROOT /usr/sbin/update-grub

scripts/sources-media

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+MEDIUM_PATH="/run/live/medium"
+RELEASE="bookworm"
+
+if [ "$1" = "-u" ]; then
+    umount $CHROOT/$MEDIUM_PATH
+    rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list
+    chroot $CHROOT apt-get update
+    exit 0
+fi
+
+# Remove the base sources, we will configure sources in a later phase
+rm -f $CHROOT/etc/apt/sources.list.d/base.list
+
+mkdir -p $CHROOT/$MEDIUM_PATH
+mount --bind $MEDIUM_PATH $CHROOT/$MEDIUM_PATH
+echo "deb [trusted=yes] file:$MEDIUM_PATH $RELEASE main" > $CHROOT/etc/apt/sources.list.d/debian-live-media.list
+chroot $CHROOT apt-get update
+# Attempt safest way to remove cruft
+rmdir $CHROOT/run/live/medium
+rmdir $CHROOT/run/live
+
+exit 0