Update.

Reviewed-on: dataprolet/ArchISO#1

README.md

@@ -0,0 +1,28 @@
+## Custom Arch Linux ISO Creator
+  
+This script creates a custom Arch Linux ISO using _archiso_.  
+  
+### Features   
+- installs _archiso_ if not installed  
+- creates working directory _~/.archiso_
+- cleans working directory before
+- writes output into logfile  
+- creates non-root user using your systems global $USER variable  
+- creates a password for the user 
+- adds user to sudoers and wheel group    
+- boots into KDE Plasma using SDDM and auto-logins your user (X11)  
+- contains Firefox and Konsole
+- 
+  
+### Customizablility  
+- add packages to the $pkgs array  
+- change between releng and baseline profile  
+- change username  
+-   
+  
+### Usage  
+Just execute the script:
+
+```
+./archiso.sh
+```

archiso.sh

@@ -3,7 +3,6 @@
 ### https://wiki.archlinux.org/title/Archiso
 
 set -eou pipefail
-set -x
 
 # Test if archiso is installed
 if ! pacman -Qs archiso > /dev/null; then
@@ -25,10 +24,26 @@ logfile="${logdir}/$(date +%Y-%m-%d_%H:%M).log"
 exec >> >(tee -i "${logfile}")
 exec 2>&1
 
-# Ask password for ISO user
+### Customization
-pw_hash=$(openssl passwd -6)
 
-# Profile to use
+# 1. Username
+#USER=""
+
+# 2. Packages
+declare -a pkgs=(
+    firefox
+    konsole
+    plasma-desktop
+    sddm
+    plasma-nm
+    networkmanager
+)
+
+# 3. Plasma session
+session="plasmax11" # X11
+#session="plasma"    # Wayland
+
+# 4. Profile to use
 profile="releng"
 #profile="baseline"
 
@@ -38,18 +53,20 @@ profile="releng"
 # baseline is a minimal configuration, that includes only the bare minimum
 # packages required to boot the live environment from the medium.
 
+# Ask password for ISO user
+pw_hash=$(openssl passwd -6)
+
 # Define directories
 dir="/home/$USER/.archiso"
 prof_dir="${dir}/${profile}"
 pkgs_file="${prof_dir}/packages.x86_64"
-#workdir="${dir}/.tmp"
 workdir="/tmp/archiso"
 root_etc="${prof_dir}/airootfs/etc"
 
 # Delete old profile
-sudo rm -rf ${prof_dir}
+err sudo rm -rf "${prof_dir}"
-sudo rm -rf ${dir}/output/*
+err sudo rm -rf ${dir}/output/*
-sudo rm -rf ${dir}/.tmp/*
+err sudo rm -rf ${workdir}
 
 # Copy new profile template
 # https://wiki.archlinux.org/title/Archiso#Prepare_a_custom_profile
@@ -59,14 +76,6 @@ cp -r "/usr/share/archiso/configs/${profile}" "${dir}"
 # https://wiki.archlinux.org/title/Archiso#Selecting_packages
 touch "${pkgs_file}"
 
-declare -a pkgs=(
-    firefox
-    konsole
-    plasma-desktop
-    sddm
-    sddm-kcm
-)
-
 for pkg in "${pkgs[@]}"; do
     echo "${pkg}" >> "${pkgs_file}"
 done
@@ -76,14 +85,19 @@ done
 ln -s /usr/lib/systemd/system/sddm.service \
     "${root_etc}/systemd/system/display-manager.service"
 
+# Enable NetworkManager
+mkdir -p "${root_etc}/systemd/system/network-online.target.wants"
+ln -s /usr/lib/systemd/system/NetworkManager.service \
+    "${root_etc}/systemd/system/network-online.target.wants/"
+
 # Autologin config
 # https://wiki.archlinux.org/title/Archiso#Changing_automatic_login
 mkdir "${root_etc}/sddm.conf.d"
 cat << EOF > "${root_etc}/sddm.conf.d/autologin.conf"
 [Autologin]
 Relogin=false
-Session=plasmax11
+Session=${session}
-User=$USER
+User=${USER}
     
 [Theme]
 Current=breeze
@@ -108,17 +122,34 @@ echo "${USER}":x:1000: >> "${root_etc}/group"
 echo root:!*::root > "${root_etc}/gshadow"
 echo "${USER}":!*:: >> "${root_etc}/gshadow"
 
-sed -i '27s/.*/  ["\/etc\/gshadow"]="0:0:0400"/' "$HOME/.archiso/releng/profiledef.sh"
+sed -i '27s/.*/  ["\/etc\/gshadow"]="0:0:0400"/' "${HOME}/.archiso/releng/profiledef.sh"
-echo ")" >> "$HOME/.archiso/releng/profiledef.sh"
+echo ")" >> "${HOME}/.archiso/releng/profiledef.sh"
 
 echo "%wheel ALL=(ALL) ALL" > "${root_etc}/sudoers"
 
+# Change keyboard layout to German
+echo "KEYMAP=de-latin1" > "${root_etc}/vconsole.conf"
+    
+mkdir -p "${root_etc}/X11/xorg.conf.d"
+cat << EOF > "${root_etc}/X11/xorg.conf.d/00-keyboard.conf"
+# Written by systemd-localed(8), read by systemd-localed and Xorg. It's
+# probably wise not to edit this file manually. Use localectl(1) to
+# instruct systemd-localed to update it.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "de"
+EndSection
+EOF
+
 # Create image
 mkdir -p "${workdir}"
-nice -n 19 ionice -c 3 sudo mkarchiso -w "${workdir}" -o "${dir}/output" "${prof_dir}"
+sudo mkarchiso -w "${workdir}" -o "${dir}/output" "${prof_dir}"
+
+# Notification
+notify-send -t 5000 'ArchISO' 'ISO created successfully.' &&
+if [[ -f /usr/share/sounds/ocean/stereo/dialog-information.oga ]]; then
+    pw-play /usr/share/sounds/ocean/stereo/dialog-information.oga
+fi
 
 exit 0
-
-# To-Dos
-# - NetworkManager?
-# - SDDM Loginscreen?