repo update

build-all.sh

@@ -20,4 +20,3 @@ git pull --ff
 ./my-distro-devuan-32/BldHelper.sh
 ./my-distro-devuan-32-pae/BldHelper.sh
 ./my-distro-devuan-64/BldHelper.sh
-./my-distro-ubuntu-64/BldHelper.sh

calamares/debian/calamares/settings.conf

@@ -78,11 +78,15 @@ sequence:
   - bootloader
   - packages
   - luksbootkeyfile
+  - luksopenswaphookcfg
   - plymouthcfg
   - initramfscfg
   - initramfs
   - sources-media-unmount
   - sources-final
+  - update-system
+  - grub-defaults
+  - shellprocess
   - umount
 
 # Phase 3 - postinstall.

calamares/debian/sources-final/sources-final

@@ -9,7 +9,7 @@ RELEASE="bookworm"
 cat << EOF > $CHROOT/etc/apt/sources.list
 # See https://wiki.debian.org/SourcesList for more information.
 
-deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware non-free non-free-firmware-firmware
+deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
 deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
 
 deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware

calamares/devuan/calamares/settings.conf

@@ -78,11 +78,15 @@ sequence:
   - bootloader
   - packages
   - luksbootkeyfile
+  - luksopenswaphookcfg
   - plymouthcfg
   - initramfscfg
   - initramfs
   - sources-media-unmount
   - sources-final
+  - update-system
+  - grub-defaults
+  - shellprocess
   - umount
 
 # Phase 3 - postinstall.

calamares/modules/grub-defaults/module.desc

@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "grub-defaults"
+interface:  "process"
+command:    "/usr/sbin/grub-defaults"
+timeout:    600

calamares/modules/update-system/module.desc

@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "update-system"
+interface:  "process"
+command:    "/usr/sbin/update-system"
+timeout:    600

calamares/schemas/96_calamares-settings-debian.gschema.override

@@ -0,0 +1,10 @@
+# Launcher icons
+[org.gnome.shell]
+favorite-apps=['calamares-install-debian.desktop', firefox.desktop', 'libreoffice-writer.desktop', 'thunar.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
+
+# We don't want the screensaver to enable on the live media while installing
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+
+[org.gnome.desktop.session]
+idle-delay=0

calamares/scripts/grub-defaults

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppermintOS Team  (peppermintosteam@proton.me)
+
+# This script configures grub defaults after Debian installation.
+
+# Define CHROOT
+  CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+
+# Sets GRUB configuration.
+# Writes the configuration to the /etc/default/grub file.
+# Updates the bootloader.
+
+# Check if CHROOT is set
+if [ -z "$CHROOT" ]; then
+    echo "CHROOT not set. Exiting."
+    exit 1
+fi
+
+# Defines the variables
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="My-distro"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
+GRUB_CMDLINE_LINUX=""
+GRUB_GFXMODE=1440x900
+GRUB_THEME="/boot/grub/themes/my-distro/theme.txt"
+GRUB_DISABLE_OS_PROBER=false
+
+# GRUB configuration file path
+GRUB_CONFIG_FILE="$CHROOT/etc/default/grub"
+
+# Modify the GRUB file
+sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE
+sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE
+sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE
+sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE
+sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE
+sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE
+# Add GRUB_THEME if it doesn't exist
+if ! grep -q "^GRUB_THEME=" $GRUB_CONFIG_FILE; then
+    echo "GRUB_THEME=\"$GRUB_THEME\"" >> $GRUB_CONFIG_FILE
+else
+    sed -i "s#^GRUB_THEME=.*#GRUB_THEME=\"$GRUB_THEME\"#" $GRUB_CONFIG_FILE
+fi
+sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE
+
+# Run update-grub after modifying the file
+chroot $CHROOT update-grub
+
+

calamares/scripts/update-system

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Apply updates to the system
+
+# Function to update the system
+function update_system() {
+  # Define CHROOT
+  CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+  
+  # Verifying CHROOT
+  if [ -z "$CHROOT" ]; then
+    echo "Error: CHROOT is not set."
+    exit 1
+  fi
+
+  echo "Updating the system..."
+  
+  # Update the package list
+  chroot $CHROOT /usr/bin/apt update
+  
+  # Update installed packages
+  chroot $CHROOT /usr/bin/apt upgrade -y
+  
+  # Remove unnecessary packages
+  chroot $CHROOT /usr/bin/apt autoremove -y
+  
+  # Clean the APT cache
+  chroot $CHROOT /usr/bin/apt clean
+  
+  echo "System successfully updated!"
+}
+
+# Run the function to update the system
+update_system
+