From 55f6fe8903fe97e5fd1fd455fe5c2d55f3a8427f Mon Sep 17 00:00:00 2001 From: Celestia Ludenberg Date: Thu, 11 Jun 2026 18:22:04 +0200 Subject: [PATCH] ISO fixes: rename liveuser->antergos, add Antergos NeXT os-release, drop lsb-release, fix wallpaper/Plasma setup --- airootfs/etc/group | 14 ++++++------- airootfs/etc/gshadow | 2 +- airootfs/etc/os-release | 10 ++++++++++ .../src/etc/skel/.bashrc | 8 ++++---- airootfs/usr/lib/os-release | 10 ++++++++++ packages.x86_64 | 2 -- run_before_squashfs.sh | 20 +++++++++++-------- 7 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 airootfs/etc/os-release create mode 100644 airootfs/usr/lib/os-release diff --git a/airootfs/etc/group b/airootfs/etc/group index 788928c..f8bed70 100755 --- a/airootfs/etc/group +++ b/airootfs/etc/group @@ -1,8 +1,8 @@ root:x:0:root -adm:x:4:liveuser -wheel:x:10:liveuser -uucp:x:14:liveuser -nopasswdlogin:x:966:liveuser -rfkill:x:983:liveuser -sys:x:3:bin,liveuser -liveuser:x:1000:liveuser +adm:x:4:antergos +wheel:x:10:antergos +uucp:x:14:antergos +nopasswdlogin:x:966:antergos +rfkill:x:983:antergos +sys:x:3:bin,antergos +antergos:x:1000:antergos diff --git a/airootfs/etc/gshadow b/airootfs/etc/gshadow index 29a1e7b..aeb809d 100755 --- a/airootfs/etc/gshadow +++ b/airootfs/etc/gshadow @@ -1,2 +1,2 @@ root:!*::root -liveuser:!*:: +antergos:!*:: diff --git a/airootfs/etc/os-release b/airootfs/etc/os-release new file mode 100644 index 0000000..395bab3 --- /dev/null +++ b/airootfs/etc/os-release @@ -0,0 +1,10 @@ +NAME="Antergos NeXT" +PRETTY_NAME="Antergos NeXT" +ID=antergos +ID_LIKE="arch" +BUILD_ID=rolling +VERSION_ID="rolling" +HOME_URL="https://github.com/Antergos-NeXT" +SUPPORT_URL="https://github.com/Antergos-NeXT" +BUG_REPORT_URL="https://github.com/Antergos-NeXT/issues" +LOGO=antergos-icon diff --git a/airootfs/root/antergos-skel-liveuser/src/etc/skel/.bashrc b/airootfs/root/antergos-skel-liveuser/src/etc/skel/.bashrc index cd64f7b..f731d60 100755 --- a/airootfs/root/antergos-skel-liveuser/src/etc/skel/.bashrc +++ b/airootfs/root/antergos-skel-liveuser/src/etc/skel/.bashrc @@ -7,9 +7,9 @@ [[ -f ~/.welcome_screen ]] && . ~/.welcome_screen -_set_liveuser_PS1() { +_set_antergos_PS1() { PS1='[\u@\h \W]\$ ' - if [ "$(whoami)" = "liveuser" ] ; then + if [ "$(whoami)" = "antergos" ] ; then local iso_version="$(grep ^VERSION= /usr/lib/antergos-release 2>/dev/null | cut -d '=' -f 2)" if [ -n "$iso_version" ] ; then local prefix="antergos-" @@ -18,8 +18,8 @@ _set_liveuser_PS1() { fi fi } -_set_liveuser_PS1 -unset -f _set_liveuser_PS1 +_set_antergos_PS1 +unset -f _set_antergos_PS1 ShowInstallerIsoInfo() { local file=/usr/lib/antergos-release diff --git a/airootfs/usr/lib/os-release b/airootfs/usr/lib/os-release new file mode 100644 index 0000000..395bab3 --- /dev/null +++ b/airootfs/usr/lib/os-release @@ -0,0 +1,10 @@ +NAME="Antergos NeXT" +PRETTY_NAME="Antergos NeXT" +ID=antergos +ID_LIKE="arch" +BUILD_ID=rolling +VERSION_ID="rolling" +HOME_URL="https://github.com/Antergos-NeXT" +SUPPORT_URL="https://github.com/Antergos-NeXT" +BUG_REPORT_URL="https://github.com/Antergos-NeXT/issues" +LOGO=antergos-icon diff --git a/packages.x86_64 b/packages.x86_64 index 8959c8a..fc37223 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -17,7 +17,6 @@ linux-firmware linux-firmware-marvell linux-headers logrotate -lsb-release man-db man-pages mdadm @@ -278,4 +277,3 @@ yay ## Installer cnchi - diff --git a/run_before_squashfs.sh b/run_before_squashfs.sh index 99bf673..7f3e216 100755 --- a/run_before_squashfs.sh +++ b/run_before_squashfs.sh @@ -68,11 +68,11 @@ echo "---> generate mirrorlist done ---> " pacman -Syy echo "---> updating package db done ---> " -echo "---> backup bash configs from skel to replace after liveuser creation --->" +echo "---> backup bash configs from skel to replace after antergos creation --->" mkdir -p "/root/filebackups/" cp -af "/etc/skel/"{".bashrc",".bash_profile"} "/root/filebackups/" -echo "---> Install liveuser skel (in case of conflicts use overwrite) --->" +echo "---> Install antergos skel (in case of conflicts use overwrite) --->" pacman -U --noconfirm --overwrite "/etc/skel/.bash_profile","/etc/skel/.bashrc" -- "/root/antergos-skel-liveuser/"*".pkg.tar.zst" echo "---> start validate skel files --->" ls /etc/skel/.* @@ -87,14 +87,13 @@ ln -sf "/usr/share/zoneinfo/UTC" "/etc/localtime" echo "---> Set root permission and shell --->" usermod -s /usr/bin/bash root -echo "---> Create liveuser --->" -useradd -m -p "" -g 'liveuser' -G 'sys,rfkill,wheel,uucp,nopasswdlogin,adm,tty' -s /bin/bash liveuser +echo "---> Create antergos --->" +useradd -m -p "" -g 'antergos' -G 'sys,rfkill,wheel,uucp,nopasswdlogin,adm,tty' -s /bin/bash antergos if [[ -f "/root/liveuser.png" ]]; then - cp "/root/liveuser.png" "/var/lib/AccountsService/icons/liveuser" - rm "/root/liveuser.png" + cp "/root/liveuser.png" "/var/lib/AccountsService/icons/antergos" fi -echo "---> Remove liveuser skel to clean for target skel --" +echo "---> Remove antergos skel to clean for target skel --" pacman -Sy pacman -Rns --noconfirm -- "antergos-skel-liveuser" rm -rf "/root/antergos-skel-liveuser" @@ -135,10 +134,15 @@ mv "/root/antergos-wallpaper.png" "/usr/share/antergos/backgrounds/antergos-wall mv "/root/livewall.png" "/usr/share/antergos/backgrounds/antergos-wallpaper-live.png" chmod 644 "/usr/share/antergos/backgrounds/"*".png" +echo "---> Register wallpaper for Plasma --->" +mkdir -p "/usr/share/wallpapers/Antergos/contents/images" +cp "/usr/share/antergos/backgrounds/antergos-wallpaper-live.png" "/usr/share/wallpapers/Antergos/contents/images/1920x1080.png" + echo "---> Install Antergos icon --->" mkdir -p "/usr/share/antergos" if [[ -f "/root/liveuser.png" ]]; then cp "/root/liveuser.png" "/usr/share/antergos/antergos-icon.png" + rm "/root/liveuser.png" fi echo "---> install bash configs back into /etc/skel for offline install target --->" @@ -159,7 +163,7 @@ pacman -Qs | grep "/linux " | cut -c7- >> iso_package_versions pacman -Qs | grep "/mesa " | cut -c7- >> iso_package_versions pacman -Qs | grep "/xorg-server " | cut -c7- >> iso_package_versions pacman -Qs | grep "/nvidia-utils " | cut -c7- >> iso_package_versions -mv "iso_package_versions" "/home/liveuser/" +mv "iso_package_versions" "/home/antergos/" echo "---> Clean pacman log and package cache --->" rm "/var/log/pacman.log"