Merge pull request #108 from Githubguy132010/dev

Major refactor

Author: Githubguy132010

.github/workflows/build.yaml

@@ -85,6 +85,13 @@ jobs:
             rm -rf workdir/ out/
             mkdir -p out/
             
+            # Fix the profiledef.sh file to ensure correct SquashFS options
+            sed -i 's/-threads/-Xcompression-threads/' profiledef.sh || true
+            
+            # Verify SquashFS options
+            echo '=== Checking SquashFS options in profiledef.sh ==='
+            grep 'airootfs_image_tool_options' profiledef.sh
+            
             # Build the ISO with verbose output
             mkarchiso -v -w workdir/ -o out/ . 2>&1 | tee build.log || {
               echo '::error::ISO build failed!'

.github/workflows/dockerfile-check.yaml

@@ -6,18 +6,57 @@ on:
   workflow_dispatch:
   schedule:
     # Run the workflow on the 1st of every month at midnight
-    - cron: 0 0 * * *
+    - cron: '0 0 1 * *'
 
 jobs:
   build:
-    runs-on: ubuntu-latest  # Use a standard runner
+    runs-on: ubuntu-latest
+    timeout-minutes: 120  # Add a timeout to prevent hung builds
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Build and Run Docker container
+      - name: Set up Environment
         run: |
-          set -e  # Exit immediately if a command exits with a non-zero status
-          docker build -t arch-iso-builder . || { echo "Docker build failed"; exit 1; }
-          docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ." || { echo "ISO creation failed"; exit 1; }
+          echo "Setting up environment..."
+          mkdir -p out
+          chmod +x scripts/entrypoint.sh
+          chmod +x scripts/select-mirrors.sh
+          chmod +x profiledef.sh
+
+      - name: Build Docker Image
+        run: |
+          echo "Building Docker image..."
+          docker build -t arch-iso-builder . || { 
+            echo "::error::Docker build failed"
+            exit 1
+          }
+
+      - name: Validate Configuration
+        run: |
+          echo "Validating configuration..."
+          docker run --rm -v "$(pwd)":/workdir arch-iso-builder validate || {
+            echo "::error::Configuration validation failed"
+            exit 1
+          }
+
+      - name: Build ISO
+        run: |
+          echo "Building ISO..."
+          # Create a small-scale test build with output to verify the process works
+          docker run --rm --privileged \
+            -v "$(pwd)":/workdir \
+            arch-iso-builder build out work || {
+              echo "::error::ISO build failed"
+              exit 1
+            }
+          
+          # Verify that output directory contains files
+          if [ ! -d "out" ] || [ -z "$(ls -A out 2>/dev/null)" ]; then
+            echo "::error::Output directory is empty or does not exist"
+            exit 1
+          else
+            echo "ISO build process completed successfully!"
+            ls -la out
+          fi

airootfs/etc/inputrc

@@ -0,0 +1,14 @@
+# Disable all bell sounds in readline applications
+set bell-style none
+
+# Make Tab autocomplete regardless of filename case
+set completion-ignore-case on
+
+# Show all autocomplete results at once
+set page-completions off
+
+# If there are more than 200 possible completions for a word, ask to show them all
+set completion-query-items 200
+
+# Show extra file information when completing, like `ls -F` does
+set visible-stats on

airootfs/etc/mkinitcpio.conf.d/performance.conf

@@ -0,0 +1,9 @@
+# Performance optimizations for mkinitcpio
+# Use all available CPU cores for compression
+COMPRESSION_OPTIONS=(-T0)
+
+# Use faster zstd compression with good ratio
+COMPRESSION="zstd"
+
+# Use better hooks order for faster boot
+HOOKS=(base udev autodetect modconf block filesystems keyboard)

airootfs/etc/modprobe.d/alsa-no-beep.conf

@@ -0,0 +1,5 @@
+# Disable PC speaker beeps through ALSA
+options snd_hda_intel beep_mode=0
+options snd_hda_core beep_mode=0
+# Some hardware may require this as well
+options snd-pcsp index=-2

airootfs/etc/modprobe.d/nobeep.conf

@@ -0,0 +1,17 @@
+# Disable PC Speaker
+blacklist pcspkr
+blacklist snd_pcsp
+
+# Disable additional beep modules
+blacklist hpilo
+blacklist ipmi_si
+blacklist hpwdt
+blacklist toshiba_acpi
+
+# PC speaker options if module is loaded anyway
+options pcspkr enable=0
+options snd_pcsp enable=0
+
+# Explicitly install the dummy module instead
+install pcspkr /bin/true
+install snd_pcsp /bin/true

airootfs/etc/skel/.bashrc

@@ -0,0 +1,25 @@
+# ~/.bashrc: executed by bash for non-login shells
+
+# Disable terminal bell in bash
+bind 'set bell-style none'
+
+# If not running interactively, don't do anything else
+[[ $- != *i* ]] && return
+
+# Color prompt
+PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+
+# Enable color support
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias egrep='egrep --color=auto'
+
+# Add useful aliases
+alias ll='ls -l'
+alias la='ls -la'
+
+# History settings
+HISTCONTROL=ignoreboth
+HISTSIZE=1000
+HISTFILESIZE=2000

airootfs/etc/systemd/system/no-beep.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Disable system beeps
+Documentation=https://github.com/Githubguy132010/Arch-Linux-without-the-beeps
+DefaultDependencies=no
+Before=sysinit.target
+After=local-fs.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/bash -c "rmmod pcspkr snd_pcsp 2>/dev/null || true"
+ExecStart=/bin/bash -c "echo 'blacklist pcspkr' > /etc/modprobe.d/nobeep.conf"
+ExecStart=/bin/bash -c "echo 'blacklist snd_pcsp' >> /etc/modprobe.d/nobeep.conf"
+ExecStart=/bin/bash -c "if [ -f /sys/module/i8042/parameters/nopnp ]; then echo 1 > /sys/module/i8042/parameters/nopnp; fi"
+
+[Install]
+WantedBy=sysinit.target

airootfs/etc/systemd/system/sysinit.target.wants/no-beep.service

@@ -0,0 +1 @@
+/etc/systemd/system/no-beep.service

dockerfile

@@ -1,15 +1,35 @@
-FROM archlinux:latest
+FROM archlinux:latest AS builder
 
-# Install necessary packages
+# Set up parallel downloads and other optimizations
+COPY pacman.conf /etc/pacman.conf
+
+# Update system and install necessary packages
 RUN pacman -Syu --noconfirm && \
-    pacman -S --noconfirm git archiso grub
+    pacman -S --noconfirm --needed \
+    git \
+    archiso \
+    grub \
+    base-devel \
+    && pacman -Scc --noconfirm
+
+# Set the working directory
+WORKDIR /build
+
+# Copy only necessary files for package installation
+COPY packages.x86_64 bootstrap_packages.x86_64 profiledef.sh ./
+
+# Create a new final image
+FROM builder AS final
 
 # Set the working directory
 WORKDIR /workdir
 
-# Copy files into the container
+# Copy the rest of the files
 COPY . .
 
-# Instead of running mkarchiso here, we leave it for later execution
-# Create an entrypoint or leave it to manual execution
-CMD ["/bin/bash"]
+# Use an entrypoint script for better flexibility
+COPY ./scripts/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["build"]