From b3bbc4e8b6e70cb06819080dd98d45f0d934239d Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Fri, 18 Oct 2024 23:46:47 +0000
Subject: [PATCH] - Clean the house - refs #991 Call deploy_installer earliier

---
 builder.sh      |  3 ++-
 chroot_setup.sh | 24 ------------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/builder.sh b/builder.sh
index 89ba99c..538c401 100755
--- a/builder.sh
+++ b/builder.sh
@@ -95,6 +95,7 @@ then
 fi
 exec_as_sudo mkdir -p $CHROOT_DIR/etc/calamares/
 exec_as_sudo cp -r calamares/* $CHROOT_DIR/etc/calamares/
+deploy_installer
 
 # # Create mount points
 exec_as_sudo mount --bind /dev/ $CHROOT_DIR/dev
@@ -103,7 +104,7 @@ exec_as_sudo mount --bind /run/ $CHROOT_DIR/run
 
 # Execute chroot_setup.sh
 exec_as_sudo_in_chroot $CHROOT_DIR /chroot_setup.sh
-deploy_installer
+
 
 # Clean up the environment
 umount_in_host $CHROOT_DIR/dev
diff --git a/chroot_setup.sh b/chroot_setup.sh
index 5100be0..0ad0251 100644
--- a/chroot_setup.sh
+++ b/chroot_setup.sh
@@ -52,22 +52,6 @@ EOF
     chmod +x /root/Desktop/opengnsys-installer.desktop
 }
 
-function create_desktop_installer() {
-    mkdir -p /etc/skel/Desktop/
-    cat <<EOF > /etc/skel/Desktop/install.desktop
-[Desktop Entry]
-Name=Install Opengnsys
-Commnet=Start the OpenGnsys installer
-Exec=calamares
-Type=Application
-Icon=system-installer
-Categories=System;Installer;
-Terminal=false
-
-EOF
-
-}
-
 function set_pkg_configuration() {
     echo "keyboard-configuration keyboard-configuration/layout select Spanish"  | debconf-set-selections
     echo "keyboard-configuration keyboard-configuration/variant select Spanish" | debconf-set-selections
@@ -178,13 +162,6 @@ function create_image2(){
 
 }
 
-function autostart_calamares() {
-    mkdir -p /etc/xdg/openbox
-    echo <<EOF > /etc/xdg/openbox/autostart
-calamares & 
-EOF
-}
-
 function install_mesa_repo() {
     add-apt-repository ppa:kisak/kisak-mesa
     apt -y update
@@ -217,7 +194,6 @@ install_no_recommends linux-image-generic
 user_add
 set_root_passwd
 configure_divert
-create_desktop_installer
 remove_unneeded_packages
 reconfigure_packages
 configure_sddm