update calamares configs and files

bootloader-config/bootloader-config

@@ -2,20 +2,53 @@
 
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
 
-# Set secure permissions for the initramfs if we're configuring
+# Install luks utilities if needed.
+# Also, set secure permissions for the initramfs if we're configuring
 # full-disk-encryption. The initramfs is re-generated later in the
 # installation process so we only set the permissions snippet without
 # 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
 
+# Update packages in the repos
+chroot $CHROOT apt-get update
+
 echo "Running bootloader-config..."
 
-if [ -d /sys/firmware/efi/efivars ]; then
+# Detect architecture and install the appropriate GRUB package
-    echo " * Installing grub-efi (uefi)..."
+ARCH=$(uname -m)
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 cryptsetup keyutils
+case "$ARCH" in
-else
+    x86_64)
-    echo " * install grub... (bios)"
+        if [ -d /sys/firmware/efi/efivars ]; then
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
+            echo " * Installing grub-efi (uefi)..."
-fi
+            DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64
+        else
+            echo " * Installing grub-pc (bios)..."
+            DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
+        fi
+        ;;
+i686)
+    if [ -d /sys/firmware/efi/efivars ]; then
+        echo " * Installing grub-efi-ia32 (uefi 32-bit)..."
+        DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32
+    else
+        echo " * Installing grub-pc (bios 32-bit)..."
+        DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
+    fi
+        ;;
+    aarch64)
+        echo " * Installing grub-efi-arm64 (uefi arm64)..."
+        DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-arm64
+        ;;
+    *)
+        echo "Unsupported architecture: $ARCH"
+        exit 1
+        ;;
+esac
+
+# Re-enable os-prober:
+sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub
+chroot $CHROOT /usr/sbin/update-grub
+

calamares/calamares/settings.conf

@@ -5,18 +5,6 @@
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
 modules-search: [ local, /usr/lib/calamares/modules ]
 
-# YAML: list of maps of string:string key-value pairs.
-instances:
-- id:       packages
-  module:   netinstall
-  config:   netinstall-packages.conf
-- id:       system
-  module:   netinstall
-  config:   netinstall-system.conf
-- id:       pkgs
-  module:   netinstall
-  config:   netinstall-pkgs.conf
-
 # If this is set to true, Calamares refers to itself as a "setup program"
 # rather than an "installer". Defaults to the value of dont-chroot, but
 # Calamares will complain if this is not explicitly set.
@@ -61,7 +49,6 @@ sequence:
   - locale
   - keyboard
   - partition
-  - netinstall@packages
   - users
   - summary
 
@@ -91,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
+

devuan/Devuan.info

@@ -1,95 +0,0 @@
-#ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog
-X-Exclude-Suites: jessie , ascii, beowulf
-
-Suite: {series}
-RepositoryType: deb
-BaseURI: http://deb.devuan.org/merged/
-MatchURI: ((http|ftp)[0-9]*\.([a-z]*\.){{0,1}}|deb\.|httpredir\.)devuan\.org
-MirrorsFile: Devuan.mirrors
-Description: Devuan {version} '{codename}'
-Component: main
-CompDescription: Officially supported
-Component: contrib
-CompDescription: DFSG-compatible Software with Non-Free Dependencies
-Component: non-free
-CompDescription: Non-DFSG-compatible Software
-
-Suite: {series}-security
-RepositoryType: deb
-BaseURI: http://deb.devuan.org/merged/
-MatchURI: security\.devuan\.org
-ParentSuite: {series}
-Description: Security updates
-X-Version: ge 11
-
-Suite: {series}/updates
-RepositoryType: deb
-BaseURI: http://deb.devuan.org/merged/
-MatchURI: security\.devuan\.org
-ParentSuite: {series}
-Description: Security updates
-X-Version: le 10
-
-Suite: {series}-updates
-RepositoryType: deb
-ParentSuite: {series}
-Description: Recommended updates
-X-Version: ge 7
-
-Suite: {series}-proposed-updates
-RepositoryType: deb
-ParentSuite: {series}
-Description: Proposed updates
-
-Suite: stable
-RepositoryType: deb
-BaseURI: http://deb.devuan.org/merged/
-MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}devuan\.org
-MirrorsFile: Devuan.mirrors
-Description: Devuancurrent stable release
-Component: main
-CompDescription: Officially supported
-Component: contrib
-CompDescription: DFSG-compatible Software with Non-Free Dependencies
-Component: non-free
-CompDescription: Non-DFSG-compatible Software
-
-Suite: testing
-RepositoryType: deb
-BaseURI: http://deb.devuan.org/merged/
-MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}devuan\.org
-MirrorsFile: Devuan.mirrors
-Description: Devuantesting
-Component: main
-CompDescription: Officially supported
-Component: contrib
-CompDescription: DFSG-compatible Software with Non-Free Dependencies
-Component: non-free
-CompDescription: Non-DFSG-compatible Software
-
-Suite: sid
-RepositoryType: deb
-BaseURI: http://deb.devuan.org/merged/
-MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}devuan\.org
-MirrorsFile: Devuan.mirrors
-Description: Devuan'ceres' (unstable)
-Component: main
-CompDescription: Officially supported
-Component: contrib
-CompDescription: DFSG-compatible Software with Non-Free Dependencies
-Component: non-free
-CompDescription: Non-DFSG-compatible Software
-
-Suite: unstable
-RepositoryType: deb
-BaseURI: http://deb.devuan.org/merged/
-MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}devuan\.org
-MirrorsFile: Devuan.mirrors
-Description: Devuan'ceres' (unstable)
-Component: main
-CompDescription: Officially supported
-Component: contrib
-CompDescription: DFSG-compatible Software with Non-Free Dependencies
-Component: non-free
-CompDescription: Non-DFSG-compatible Software
-

devuan/Devuan.mirrors

@@ -1,40 +0,0 @@
-#LOC:FR
-http:pkgmaster.devuan.org/devuan/
-#LOC:NL
-http://sledjhamr.org/devuan/
-http://mirror.koddos.net/devuan/
-http://mirror.vpgrp.io/devuan/
-#LOC:CL
-http://devuan.dcc.uchile.cl/devuan/
-http://dist-mirror.fem.tu-ilmenau.de/devuan/
-#LOC:DE
-http://ftp.fau.de/devuan/
-http://mirror.checkdomain.de/devuan/
-http://devuan.bio.lmu.de/devuan/
-http://mirror.stinpriza.org/devuan/
-#LOC:CH
-http://mirror.ungleich.ch/mirror/packages/devuan/
-http://devuan.planetcobalt.net/devuan/
-#LOC:BG
-http://devuan.ipacct.com/devuan/
-#LOC:FI
-http://devuan.packet-gain.de/devuan/
-#LOC:BR
-http://devuan.c3sl.ufpr.br/devuan/
-#LOC:DK
-http://mirrors.dotsrc.org/devuan/
-#LOC:UY
-http://espejito.fder.edu.uy/devuan/
-#LOC:JP
-http://devuan.m10k.jp/devuan/
-#LOC:US
-http://mirrors.ocf.berkeley.edu/devuan/
-http://dev.beard.ly/devuan/
-#LOC:HU
-http://quantum-mirror.hu/mirrors/pub/devuan/
-#LOC:ES
-http://repo.ifca.es/devuan/
-#LOC:CA
-http://mishka.snork.ca/devuan/
-#LOC:TW
-http://tw1.mirror.blendbyte.net/devuan/

hooks/normal/install-firefox-latest.hook.chroot

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# Script to be used as a hook in Debian Live-Build
+# to install Firefox from the official Mozilla repository along with all available language packs
+
+# Function to set up the Mozilla repository and GPG key
+setup_repository_and_key() {
+    echo "Setting up Mozilla repository and GPG key for Firefox..."
+
+    # Create directory to store the APT repository keyring if it doesn't exist
+    install -d -m 0755 /etc/apt/keyrings
+
+    # Import the Mozilla APT repository authentication key
+    wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null
+
+    # Verify the GPG key fingerprint
+    expected_fingerprint="35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3"
+    actual_fingerprint=$(gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); print $0}')
+
+    if [ "$actual_fingerprint" == "$expected_fingerprint" ]; then
+        echo "The GPG key fingerprint matches: $actual_fingerprint."
+    else
+        echo "Verification failed: the GPG key fingerprint ($actual_fingerprint) does not match the expected one ($expected_fingerprint)."
+        exit 1
+    fi
+
+    # Add the Mozilla APT repository to the sources list
+    echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" > /etc/apt/sources.list.d/mozilla.list
+
+    # Configure APT to prioritize packages from the Mozilla repository
+    echo '
+Package: *
+Pin: origin packages.mozilla.org
+Pin-Priority: 1000
+' > /etc/apt/preferences.d/mozilla
+
+    # Update the package list
+    apt-get update
+}
+
+# Function to install Firefox and available language packs
+install_firefox() {
+    echo "Installing Firefox and its language packs..."
+
+    # Install Firefox
+    apt-get install -y firefox
+
+    # Install all available Firefox language packs
+    apt-get install -y $(apt-cache search firefox-l10n | awk '{print $1}')
+}
+
+# Main execution of the script
+main() {
+    setup_repository_and_key
+    install_firefox
+
+    echo "Firefox installation completed."
+}
+
+# Execute the main function
+main
+

my-distro-devuan-32-pae/build.sh

@@ -200,10 +200,12 @@ tumbler
 tumbler-plugins-extra
 ffmpegthumbnailer
 xterm
+git
+curl
+wget
 grub-pc
 spice-vdagent
 console-setup
-xdg-user-dirs-gtk
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
@@ -223,6 +225,8 @@ shim-helpers-i386-signed
 shim-signed
 shim-signed-common
 shim-unsigned
+
+
 " > $build/build/config/package-lists/installer.list.binary 
 
 
@@ -246,10 +250,12 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
 mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
-mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
+#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
 mkdir -p $build/build/config/includes.chroot/boot/grub/themes
+mkdir -p $build/build/config/includes.chroot/usr/lib/calamares
+mkdir -p $build/build/config/includes.chroot/etc/default
 mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates
 
 # Copy Configs to the chroot
@@ -259,6 +265,7 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin
 cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin
 cp $build/grub/grub $build/build/config/includes.chroot/etc/default
 
@@ -266,7 +273,7 @@ cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
 cp -r $build/bootloaders/* $build/build/config/includes.binary
 cp -r $build/repos/* $build/build/config/archives
 cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
-cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
+cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares
 cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
@@ -274,9 +281,11 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes
+cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares
 cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates
 
 # build the ISO #
 lb build  #--debug --verbose 
 
 
+

my-distro-devuan-32/build.sh

@@ -200,9 +200,13 @@ tumbler
 tumbler-plugins-extra
 ffmpegthumbnailer
 xterm
+git
+curl
+wget
 grub-pc
 spice-vdagent
 console-setup
+xdg-user-dirs-gtk
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
@@ -222,7 +226,6 @@ shim-helpers-i386-signed
 shim-signed
 shim-signed-common
 shim-unsigned
-xdg-user-dirs-gtk
 
 " > $build/build/config/package-lists/installer.list.binary 
 
@@ -247,10 +250,12 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
 mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
-mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
+#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
 mkdir -p $build/build/config/includes.chroot/boot/grub/themes
+mkdir -p $build/build/config/includes.chroot/usr/lib/calamares
+mkdir -p $build/build/config/includes.chroot/etc/default
 mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates
 
 # Copy Configs to the chroot
@@ -260,6 +265,7 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin
 cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin
 cp $build/grub/grub $build/build/config/includes.chroot/etc/default
 
@@ -267,7 +273,7 @@ cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
 cp -r $build/bootloaders/* $build/build/config/includes.binary
 cp -r $build/repos/* $build/build/config/archives
 cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
-cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
+cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares
 cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
@@ -275,6 +281,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes
+cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares
 cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates
 
 # build the ISO #

my-distro-devuan-64/build.sh

@@ -199,11 +199,15 @@ tumbler
 tumbler-plugins-extra
 ffmpegthumbnailer
 xterm
+git
+curl
+wget
 grub-pc
 spice-vdagent
 console-setup
 xdg-user-dirs-gtk
 
+
 " > $build/build/config/package-lists/packages.list.chroot 
 
 
@@ -247,11 +251,12 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
 mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
-mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
+#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
-mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates
 mkdir -p $build/build/config/includes.chroot/boot/grub/themes
+mkdir -p $build/build/config/includes.chroot/usr/lib/calamares
+mkdir -p $build/build/config/includes.chroot/etc/default
 mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates
 
 # Copy Configs to the chroot
@@ -261,6 +266,7 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin
 cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin
 cp $build/grub/grub $build/build/config/includes.chroot/etc/default
 
@@ -268,7 +274,7 @@ cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
 cp -r $build/bootloaders/* $build/build/config/includes.binary
 cp -r $build/repos/* $build/build/config/archives
 cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
-cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
+cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares
 cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
@@ -276,6 +282,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes
+cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares
 cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates
 
 # Build the ISO #