docker lett a build itt is illetve javítva lett a yaru és gdm sddm re lett leváltva

arch-iso-builder.sh

@@ -1,67 +1,166 @@
 #!/bin/bash
-
 # Exit on error
 set -e
-
 ##################################################################################################################
-#   Custom Arch ISO Builder Script
+#   Custom Arch ISO Builder Script (Linux Version)
 ##################################################################################################################
 
 # Get absolute path of script directory
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Check if running on btrfs
-if lsblk -f | grep btrfs > /dev/null 2>&1; then
-    echo "Warning: Building on BTRFS filesystem. Make backups before continuing."
-    read -p "Press Enter to continue... CTRL + C to stop"
-fi
-
 # Setting general parameters
 buildFolder="$SCRIPT_DIR/build"
 outFolder="$SCRIPT_DIR/out"
+dockerImageName="arch-iso-builder-gnome"
+dockerContainerName="arch-iso-builder-gnome-container"
+
+# Get current user ID and group ID
+HOST_UID=$(id -u)
+HOST_GID=$(id -g)
+
+# Check if Docker is installed
+if ! command -v docker &> /dev/null; then
+    echo "Docker is not installed. Installing Docker..."
+    sudo pacman -S --noconfirm docker
+    
+    # Start and enable Docker service
+    echo "Starting Docker service..."
+    sudo systemctl start docker
+    sudo systemctl enable docker
+    
+    # Add current user to docker group to avoid using sudo
+    echo "Adding current user to docker group..."
+    sudo usermod -aG docker $(whoami)
+    
+    echo "Docker installation completed. You may need to log out and back in for group changes to take effect."
+    echo "Continuing with Docker as root for now..."
+fi
+
+# Check if Docker daemon is running
+if ! docker info &> /dev/null; then
+    echo "Docker daemon is not running. Starting Docker service..."
+    sudo systemctl start docker
+    
+    # Wait for Docker daemon to start (with timeout)
+    echo "Waiting for Docker daemon to start..."
+    max_attempts=10
+    attempt=1
+    while ! docker info &> /dev/null; do
+        if [ $attempt -gt $max_attempts ]; then
+            echo "Error: Docker daemon failed to start after $max_attempts attempts."
+            echo "Please try starting it manually with: sudo systemctl start docker"
+            exit 1
+        fi
+        echo "Attempt $attempt/$max_attempts: Docker daemon not ready yet. Waiting 2 seconds..."
+        sleep 2
+        attempt=$((attempt+1))
+    done
+    echo "Docker daemon is now running."
+fi
 
 echo "################################################################"
 echo "Build folder: $buildFolder"
 echo "Out folder : $outFolder"
 echo "################################################################"
+echo "Building in Docker - using all CPU cores"
+echo "################################################################"
 
-# Check if archiso is installed
+# Create Docker image if it doesn't exist
-if ! pacman -Qi archiso &> /dev/null; then
+if ! docker image inspect "$dockerImageName" &>/dev/null; then
-    echo "Installing archiso..."
+    echo "Creating Docker image: $dockerImageName..."
-    sudo pacman -S --noconfirm archiso
+    # Create temporary Dockerfile
+    cat > "$SCRIPT_DIR/Dockerfile" << EOF
+FROM archlinux:latest
+
+# Update system and install required packages
+RUN pacman -Syu --noconfirm && \
+    pacman -S --noconfirm archiso base-devel git sudo
+
+# Create a build user with same UID as host user
+RUN useradd -m -G wheel -u $HOST_UID builder && \
+    echo '%wheel ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+
+# Set up working directory
+WORKDIR /build
+
+# Keep container running for reuse
+CMD ["/bin/bash"]
+EOF
+
+    # Build Docker image
+    docker build -t "$dockerImageName" -f "$SCRIPT_DIR/Dockerfile" "$SCRIPT_DIR"
+    
+    # Remove temporary Dockerfile
+    rm "$SCRIPT_DIR/Dockerfile"
 fi
 
+# Check if container exists
+if docker container inspect "$dockerContainerName" &>/dev/null; then
+    # Container exists, check if it's running
+    if [ "$(docker container inspect -f '{{.State.Running}}' "$dockerContainerName")" != "true" ]; then
+        echo "Starting existing Docker container: $dockerContainerName..."
+        docker start "$dockerContainerName"
+    else
+        echo "Using existing running Docker container: $dockerContainerName..."
+    fi
+else
+    # Container doesn't exist, create and start it
+    echo "Creating and starting Docker container: $dockerContainerName..."
+    docker run -d \
+        --name "$dockerContainerName" \
+        --privileged \
+        --cpus="$(nproc)" \
+        -v "$SCRIPT_DIR:/build" \
+        "$dockerImageName" \
+        tail -f /dev/null
+fi
+
+# Create required directories
+mkdir -p "$buildFolder" "$outFolder"
+
+# Run the build process inside Docker
+echo "Building ISO in Docker container..."
+docker exec -it "$dockerContainerName" bash -c "
+    cd /build && \
     # Make mkarchiso verbose
-sudo sed -i 's/quiet="y"/quiet="n"/g' /usr/bin/mkarchiso
+    sudo sed -i 's/quiet=\"y\"/quiet=\"n\"/g' /usr/bin/mkarchiso && \
-
+    # Clean build environment
-echo "Cleaning build environment..."
+    [ -d \"/build/build\" ] && sudo rm -rf \"/build/build\" && \
-[ -d "$buildFolder" ] && sudo rm -rf "$buildFolder"
+    mkdir -p \"/build/build\" && \
-mkdir -p "$buildFolder"
+    # Copy releng folder
-
+    cp -r \"/build/releng\" \"/build/build/\" && \
-echo "Copying releng folder to build directory..."
+    # Copy pkgs folder (if it exists), then generate repo db
-cp -r "$SCRIPT_DIR/releng" "$buildFolder/"
+    if [ -d \"/build/pkgs\" ]; then
-
+        cp -r \"/build/pkgs\" \"/build/build/\" && \
-#echo "Cleaning pacman cache..."
+        echo \"Copied pkgs folder to build directory\" && \
-#yes | sudo pacman -Scc
+        if ls /build/build/pkgs/*.pkg.tar.* 1>/dev/null 2>&1; then
-
+            echo \"Generating local repository database (repo-add custom.db.tar.gz) ...\" && \
-echo "Creating output directory..."
+            sudo repo-add /build/build/pkgs/custom.db.tar.gz /build/build/pkgs/*.pkg.tar.* && \
-mkdir -p "$outFolder"
+            echo \"Local repo database created.\"
-
+        else
-echo "Building ISO..."
+            echo \"No .pkg.tar.* files found in pkgs. Skipping repo-add.\"
-cd "$buildFolder/releng"
+        fi
-sudo mkarchiso -v -w "$buildFolder" -o "$outFolder" "$PWD"
+    else
-
+        echo \"Warning: pkgs folder not found in \$SCRIPT_DIR\"
+    fi && \
+    # Create output directory
+    mkdir -p \"/build/out\" && \
+    # Build ISO
+    cd \"/build/build/releng\" && \
+    sudo mkarchiso -v -w \"/build/build\" -o \"/build/out\" \"\$PWD\" && \
     # Save package list
-echo "Saving package list..."
+    rename=\$(date +%Y-%m-%d) && \
-rename=$(date +%Y-%m-%d)
+    if [ -f \"/build/build/iso/arch/pkglist.x86_64.txt\" ]; then
-cp "$buildFolder/iso/arch/pkglist.x86_64.txt" "$outFolder/archlinux-$rename-pkglist.txt"
+        sudo cp \"/build/build/iso/arch/pkglist.x86_64.txt\" \"/build/out/archlinux-\$rename-pkglist.txt\"
-
+    fi && \
-echo "Cleaning build environment..."
+    # Clean build environment
-[ -d "$buildFolder" ] && sudo rm -rf "$buildFolder"
+    sudo rm -rf \"/build/build\" && \
-
+    # Fix permissions on out folder
-sudo chown -R $USER:$GROUP "$outFolder"
+    sudo chown -R $HOST_UID:$HOST_GID \"/build/out\"
+"
 
 echo "################################################################"
 echo "DONE"
 echo "Check your out folder: $outFolder"
 echo "################################################################"
+

pkgs/custom.db

@@ -1 +0,0 @@
-custom.db.tar.gz

pkgs/custom.files

@@ -1 +0,0 @@
-custom.files.tar.gz

releng/airootfs/etc/dconf/db/local.d/01-yaru

@@ -243,6 +243,8 @@ running-indicator-dominant-color=true
 running-indicator-style='DOTS'
 shift-click-action='minimize'
 shift-middle-click-action='launch'
+show-icons-emblems=false
+show-icons-notifications-counter=false
 show-mounts=false
 show-show-apps-button=true
 show-trash=false

releng/airootfs/etc/mkinitcpio.d/linux.preset

@@ -0,0 +1,8 @@
+# mkinitcpio preset file for the 'linux' package on archiso
+
+PRESETS=('archiso')
+
+ALL_kver='/boot/vmlinuz-linux'
+archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
+
+archiso_image="/boot/initramfs-linux.img"

releng/airootfs/etc/motd

@@ -0,0 +1,11 @@
+To install Arch Linux follow the installation guide:
+https://wiki.archlinux.org/title/Installation_guide
+
+For Wi-Fi, authenticate to the wireless network using the iwctl utility.
+For mobile broadband (WWAN) modems, connect with the mmcli utility.
+Ethernet, WLAN and WWAN interfaces using DHCP should work automatically.
+
+After connecting to the internet, the installation guide can be accessed
+via the convenience script Installation_guide.
+
+                                          

releng/airootfs/etc/sddm.conf

@@ -0,0 +1,38 @@
+[General]
+InputMethod=
+Namespaces=
+Numlock=on
+
+[Theme]
+DisableAvatarsThreshold=7
+EnableAvatars=true
+FacesDir=/usr/share/sddm/faces
+ThemeDir=/usr/share/sddm/themes
+
+[Users]
+DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin
+HideShells=
+HideUsers=
+RememberLastSession=true
+RememberLastUser=true
+ReuseSession=true
+
+[Wayland]
+EnableHiDPI=true
+SessionCommand=/usr/share/sddm/scripts/wayland-session
+SessionDir=/usr/share/wayland-sessions
+SessionLogFile=.local/share/sddm/wayland-session.log
+
+[X11]
+DisplayCommand=/usr/share/sddm/scripts/Xsetup
+DisplayStopCommand=/usr/share/sddm/scripts/Xstop
+EnableHiDPI=true
+MinimumVT=1
+ServerArguments=-nolisten tcp
+ServerPath=/usr/bin/X
+SessionCommand=/usr/share/sddm/scripts/Xsession
+SessionDir=/usr/share/xsessions
+SessionLogFile=.local/share/sddm/xorg-session.log
+UserAuthFile=.Xauthority
+XauthPath=/usr/bin/xauth
+XephyrPath=/usr/bin/Xephyr

releng/airootfs/etc/sddm.conf.d/kde_settings.conf

@@ -0,0 +1,17 @@
+[Autologin]
+Relogin=false
+User=liveuser
+Session=
+
+[General]
+HaltCommand=/usr/bin/systemctl poweroff
+RebootCommand=/usr/bin/systemctl reboot
+
+[Theme]
+Current=raveos-sddm
+CursorTheme=Yaru
+Font=
+
+[Users]
+MaximumUid=60513
+MinimumUid=1000