From 3f241540d47f2d0410920485cbc09d60c8a64bfe Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Sat, 19 Oct 2024 10:25:58 +0000
Subject: [PATCH] - refs #994 adds  python-pyxdg to enable autostart mechanism
 in openbox - ref #994 moves configuration to default places instead or root
 space. - refs #990 moves installer script to /usr/local/bin - refs #994
 config autologin according SDDM conf https://wiki.archlinux.org/title/SDDM -
 refs #990 configure og user to execute calamares with sudo

---
 builder.sh      |  6 ++---
 chroot_setup.sh | 62 +++++++++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/builder.sh b/builder.sh
index 538c401..50779d8 100755
--- a/builder.sh
+++ b/builder.sh
@@ -53,9 +53,9 @@ function umount_in_host() {
 }
 
 function deploy_installer() {
-    exec_as_sudo mkdir -p $CHROOT_DIR/root/scripts
-    exec_as_sudo cp openGnsys-installer.sh $CHROOT_DIR/root/scripts/
-    exec_as_sudo chmod +x $CHROOT_DIR/root/scripts/openGnsys-installer.sh
+    exec_as_sudo mkdir -p $CHROOT_DIR/usr/local/bin
+    exec_as_sudo cp openGnsys-installer.sh $CHROOT_DIR/usr/local/bin
+    exec_as_sudo chmod +x $CHROOT_DIR/usr/local/bin/openGnsys-installer.sh
 }
 
 if [ -d $CHROOT_DIR ] && [ $CLEAN -eq 1 ];
diff --git a/chroot_setup.sh b/chroot_setup.sh
index 0ad0251..0e9d3e0 100644
--- a/chroot_setup.sh
+++ b/chroot_setup.sh
@@ -9,47 +9,46 @@ export DEBOOT_STRAP_URL=http://mirror.raiolanetworks.com/ubuntu/
 
 source buildlib.sh
 
-function configure_sddm() {
+function configure_sddm_and_openbox() {
     # Allow root login
     sed -ie 's/^\(.*root quiet_success\)$/#\1/' /etc/pam.d/sddm
     
     # Start pcman for the Desktop 
-    mkdir -p /root/.config/autostart/
-    cat <<EOF > /root/.config/autostart/pcmanfm.desktop
-[Desktop Entry]
-Type=Application
-Exec=pcmanfm --desktop
-Hidden=false
-NoDisplay=false
-X-GNOME-Autostart-enabled=true
-Name=PCManFM
-Comment=Lanzr PcManFm en el inicio de sesion
+    
+    #mkdir -p /root/.config/autostart/
+    # cat <<EOF > /root/.config/autostart/pcmanfm.desktop
+    mkdir -p /etc/xdg/openbox/
+    cat <<EOF > /etc/xdg/openbox/autostart
+pcmanfm --desktop &
 EOF
 
-    # Configure root autologin 
-    cat <<EOF > /etc/sddm.conf
-[Autologin]
-User=root
-Session=openbox
-
-[Users]
-MinimumUid=0
-EOF
     # Create desktop launcher for calamares
-    mkdir -p /root/Desktop
-    cat <<EOF > /root/Desktop/opengnsys-installer.desktop
+    # mkdir -p /root/Desktop
+    # cat <<EOF > /root/Desktop/opengnsys-installer.desktop
+    mkdir -p /etc/skel/Desktop
+    cat <<EOF > /etc/skel/Desktop/opengnsys-installer.desktop
 [Desktop Entry]
 Version=1.0
 Name=Install OpenGnsys
 Comment=Este es un acceso directo para ejecutar un script como root
-Exec=/root/scripts/openGnsys-installer.sh
+Exec=/usr/local/bin/openGnsys-installer.sh
 Icon=system-installer
 Terminal=false
 Type=Application
 Categories=Utility;
 
 EOF
-    chmod +x /root/Desktop/opengnsys-installer.desktop
+    # chmod +x /root/Desktop/opengnsys-installer.desktop
+    chmod +x /etc/skel/Desktop/opengnsys-installer.desktop
+
+    # Configure ssdm autologin
+    mkdir -p /etc/sddm.conf.d/
+    cat <<EOF > /etc/sddm.conf.d/autologin.conf
+[Autologin]
+User=og
+Session=openbox-session
+EOF
+
 }
 
 function set_pkg_configuration() {
@@ -169,7 +168,7 @@ function install_mesa_repo() {
 
 
 function user_add() {
-    useradd -m -s /bin/bash -G sudo og
+    useradd -m -k /etc/skel -s /bin/bash -G sudo og
     echo "og:og" | chpasswd
 }
 
@@ -178,6 +177,12 @@ function set_root_passwd() {
     echo "root:$ROOT_PASSWORD" | chpasswd
 }
 
+function add_og_to_sudoers() {
+    echo "Adding og to sudoers"
+    mkdir -p /etc/sudoers.d/
+    echo "og ALL=(ALL) NOPASSWD: /usr/bin/calamares" > /etc/sudoers.d/og
+    chmod 440 /etc/sudoers.d/og
+}
 
 ## Main 
 echo "ubuntu-fs-live" > /etc/hostname
@@ -188,15 +193,16 @@ setup_chroot
 set_pkg_configuration
 install_mesa_repo
 install_non_interactive 
-install_packages sudo ubuntu-standard sudo casper dbus-bin mesa-utils  mesa-vulkan-drivers discover  isc-dhcp-client  laptop-detect   unzip  os-prober    network-manager    net-tools    wireless-tools    wpagui    locales    grub-common    grub-gfxpayload-lists    grub-pc    grub-pc-bin    grub2-common    grub-efi-amd64-signed    shim-signed    mtools    binutils  virtualbox-guest-utils virtualbox-guest-x11
+install_packages sudo ubuntu-standard sudo casper dbus-bin mesa-utils  mesa-vulkan-drivers discover  isc-dhcp-client  laptop-detect   unzip  os-prober    network-manager    net-tools    wireless-tools    wpagui    locales    grub-common    grub-gfxpayload-lists    grub-pc    grub-pc-bin    grub2-common    grub-efi-amd64-signed    shim-signed    mtools    binutils  virtualbox-guest-utils virtualbox-guest-x11  python3-xdg
 install_non_interactive sddm openbox plymouth calamares terminator pcmanfm yad 
 install_no_recommends linux-image-generic
-user_add
 set_root_passwd
 configure_divert
 remove_unneeded_packages
 reconfigure_packages
-configure_sddm
+configure_sddm_and_openbox
+user_add
+add_og_to_sudoers
 create_image
 configure_grub_menu
 create_image2