Merge branch 'galileo-neo' of https://github.com/t2linux/EndeavourOS-…

…ISO-t2 into galileo-neo

CHANGELOG.md

@@ -1,6 +1,11 @@
 ## Changelog holding milestones and major changes to the code
 
+
 ---
+# Galileo Neo (2024)
+* fixing issue with changed license package (path changes) in mkarchiso
+* adding legacy intel fix to disable compositor on LiveSession if legacy intel with xf86-video-intel ist in use to reduce graphical issues.
+
 # Development start for Galileo Release (2023)
 * replacing xfce4 Live Session with KDE
 

airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/intel-kwinrc

@@ -0,0 +1,4 @@
+[Compositing]
+Enabled=false
+HiddenPreviews=4
+LatencyPolicy=ExtremelyLow

airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc

@@ -1 +1,2 @@
+[General]
 loginMode=emptySession

airootfs/root/endeavouros-skel-liveuser/src/etc/skel/user-commands-before.bash

@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# This file can contain commands that will be executed (as root) before
+# calamares is started. So here you may configure various settings of calamares.
+#
+# NOTE! This is an advanced feature, so you need to know *exactly* what
+# you are doing. Otherwise bad things can happen...
+# Sound knowledge of calamares, bash language, and linux commands is required
+# for a meaningful customization.
+#
+# If you add commands to this file, start the whole install process fresh
+# with terminal command 'eos-welcome' after saving this file.
+#
+# Tip: save your customized commands into a file on an internet server
+# and fetch that file with command:
+#
+#     wget -O ~/user-commands-before.bash "URL-referring-the-file"
+#
+# Note: this file is supported in ISOs *after* Galileo Neo!
+#
+#----------------------------------------------------------------------------------
+#
+# Now *you* can add your commands into function _IsoConfig below.
+#
+#----------------------------------------------------------------------------------
+
+_IsoConfig() {
+    ## Add your ISO configurations here.
+    ## This is executed as root before calamares is started.
+
+    local -r install_mode="$1"          # 'online' or 'offline'
+
+    ## Now your commands. Some examples:
+    #
+    # Set KDE-Desktop as default:
+    # printf "\ndefault: KDE-Desktop\n" >> /etc/calamares/modules/packagechooser.conf
+    # ...
+}
+
+## Execute the commands if the parameter list is valid:
+
+case "$1" in
+    offline | online) _IsoConfig "$1" ;;
+esac

airootfs/root/endeavouros-skel-liveuser/src/etc/skel/user_commands.bash

@@ -1,19 +1,23 @@
 #!/bin/bash
 #
-# This file can contain commands that will be executed at the end of
-# EndeavourOS install (online mode only) on the target system.
-# The commands will be executed as root.
+# This file can contain commands that will be executed (as root) at the end of
+# EndeavourOS install (in online mode only) on the target system.
 #
-# This allows you to customize the installed system in several ways!
+# NOTE! This is an advanced feature, so you need to know exactly
+# what you are doing. Otherwise bad things can happen...
+# Sound knowledge of bash language and linux commands is required
+# for a meaningful customization.
 #
-# If you add commands to this file, start the install process after
-# saving this file.
+# If you add commands to this file, start the whole install process fresh
+# with terminal command 'eos-welcome' after saving this file.
 #
 # Tip: save your customized commands into a file on an internet server
 # and fetch that file with command:
 #
 #     wget -O ~/user_commands.bash "URL-referring-the-file"
 #
+# Here you may customize the installed system in several ways.
+#
 # Ideas for customization:
 #   - install packages
 #   - remove packages
@@ -22,7 +26,6 @@
 #   - etc.
 #
 # Example commands:
-#
 #     pacman -S --noconfirm --needed gufw geany chromium
 #     pacman -Rsn --noconfirm xed
 #     systemctl enable ufw
@@ -36,34 +39,35 @@
 #     The 'makepkg' command suffers from the same limitation.
 #     This essentially blocks installing AUR packages here.
 #
-# Advanced tip (for ISOs since year 2022):
-#    To write files directly into $HOME, you can find the new username
-#    as the first parameter given to user_commands.bash, e.g.
-#        username="$1"
-#    Then you may write files under folder
-#        /home/$username
-#
-# For ISOs released before year 2022:
-#    Find your new username with command
-#        username=$(cat /tmp/new_username.txt)
-#
-# New installer feature at 2023-Feb-02:
-#    To help customizing calamares on the ISO, user_commands.bash will be called
-#    (as root) with 2 parameters:
-#        --iso-config
-#        "install_mode"     (one of: online, offline, community)
-#    before starting the calamares installer.
-#    For example:
-#        bash ~/user_commands.bash --iso-config online
+# Tip: if you write new files into the home directory of the new user,
+# make sure to properly set the file permissions too.
 #
 #----------------------------------------------------------------------------------
-# Full example (to try it, remove the first '#' from the lines below):
-#
-# #!/bin/bash
 #
-# # Note: needs ISO since year 2022
+# Now *you* can add your commands into function _PostInstallCommands below.
 #
-# username="$1"
-# echo "# Hello world!" >> /home/$username/.bashrc
-# pacman -S --noconfirm --needed geany chromium libreoffice-fresh
+#----------------------------------------------------------------------------------
+
+_PostInstallCommands() {
+    ## Add your "late-install" commands here.
+    ## This is executed as root near the end of calamares execution.
+
+    local -r username="$1"              # new user you created for the target
+
+    ## Now your commands. Some examples:
+    #
+    # echo "## Hello world!"           >> /home/$username/.bashrc
+    # echo "export FUNCNEST=100"       >> /home/$username/.bashrc
+    # echo "alias pacdiff=eos-pacdiff" >> /home/$username/.bashrc
+    # chmod $username:$username           /home/$username/.bashrc
+    #
+    # pacman -S --noconfirm --needed geany chromium libreoffice-fresh
+    # ...
+}
+
+## Execute the commands if the parameter list is valid:
 
+case "$1" in
+    --iso-conf* | online | offline | community) ;;   # no more supported here
+    *) _PostInstallCommands "$1" ;;
+esac

airootfs/usr/bin/GPU-Intel-installer

@@ -9,7 +9,7 @@
 
 DIE() {
     echo "$progname: error: $1" >&2
-    exit 0
+    exit 1
 }
 
 IsIntelGeneration_1_to_3() {
@@ -55,6 +55,9 @@ Main() {
                     echo "==> $progname: found Intel graphics device with id $id, installing package $pkg"
                     local pkgs=(/usr/share/packages/{$pkg,libxvmc}-*.pkg.tar.zst)
                     sudo pacman -U --noconfirm "${pkgs[@]}"
+                    echo "==> $progname: disable compositor for legacy intel in KDE live session"
+                    mv /home/liveuser/.config/intel-kwinrc /home/liveuser/.config/kwinrc
+                    chown liveuser:liveuser /home/liveuser/.config/kwinrc
                     return 0
                 fi
             fi