ISO fixes: rename liveuser->antergos, add Antergos NeXT os-release, drop lsb-release, fix wallpaper/Plasma setup
This commit is contained in:
+7
-7
@@ -1,8 +1,8 @@
|
|||||||
root:x:0:root
|
root:x:0:root
|
||||||
adm:x:4:liveuser
|
adm:x:4:antergos
|
||||||
wheel:x:10:liveuser
|
wheel:x:10:antergos
|
||||||
uucp:x:14:liveuser
|
uucp:x:14:antergos
|
||||||
nopasswdlogin:x:966:liveuser
|
nopasswdlogin:x:966:antergos
|
||||||
rfkill:x:983:liveuser
|
rfkill:x:983:antergos
|
||||||
sys:x:3:bin,liveuser
|
sys:x:3:bin,antergos
|
||||||
liveuser:x:1000:liveuser
|
antergos:x:1000:antergos
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
root:!*::root
|
root:!*::root
|
||||||
liveuser:!*::
|
antergos:!*::
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -7,9 +7,9 @@
|
|||||||
|
|
||||||
[[ -f ~/.welcome_screen ]] && . ~/.welcome_screen
|
[[ -f ~/.welcome_screen ]] && . ~/.welcome_screen
|
||||||
|
|
||||||
_set_liveuser_PS1() {
|
_set_antergos_PS1() {
|
||||||
PS1='[\u@\h \W]\$ '
|
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)"
|
local iso_version="$(grep ^VERSION= /usr/lib/antergos-release 2>/dev/null | cut -d '=' -f 2)"
|
||||||
if [ -n "$iso_version" ] ; then
|
if [ -n "$iso_version" ] ; then
|
||||||
local prefix="antergos-"
|
local prefix="antergos-"
|
||||||
@@ -18,8 +18,8 @@ _set_liveuser_PS1() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
_set_liveuser_PS1
|
_set_antergos_PS1
|
||||||
unset -f _set_liveuser_PS1
|
unset -f _set_antergos_PS1
|
||||||
|
|
||||||
ShowInstallerIsoInfo() {
|
ShowInstallerIsoInfo() {
|
||||||
local file=/usr/lib/antergos-release
|
local file=/usr/lib/antergos-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
|
||||||
@@ -17,7 +17,6 @@ linux-firmware
|
|||||||
linux-firmware-marvell
|
linux-firmware-marvell
|
||||||
linux-headers
|
linux-headers
|
||||||
logrotate
|
logrotate
|
||||||
lsb-release
|
|
||||||
man-db
|
man-db
|
||||||
man-pages
|
man-pages
|
||||||
mdadm
|
mdadm
|
||||||
@@ -278,4 +277,3 @@ yay
|
|||||||
|
|
||||||
## Installer
|
## Installer
|
||||||
cnchi
|
cnchi
|
||||||
|
|
||||||
|
|||||||
+12
-8
@@ -68,11 +68,11 @@ echo "---> generate mirrorlist done ---> "
|
|||||||
pacman -Syy
|
pacman -Syy
|
||||||
echo "---> updating package db done ---> "
|
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/"
|
mkdir -p "/root/filebackups/"
|
||||||
cp -af "/etc/skel/"{".bashrc",".bash_profile"} "/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"
|
pacman -U --noconfirm --overwrite "/etc/skel/.bash_profile","/etc/skel/.bashrc" -- "/root/antergos-skel-liveuser/"*".pkg.tar.zst"
|
||||||
echo "---> start validate skel files --->"
|
echo "---> start validate skel files --->"
|
||||||
ls /etc/skel/.*
|
ls /etc/skel/.*
|
||||||
@@ -87,14 +87,13 @@ ln -sf "/usr/share/zoneinfo/UTC" "/etc/localtime"
|
|||||||
echo "---> Set root permission and shell --->"
|
echo "---> Set root permission and shell --->"
|
||||||
usermod -s /usr/bin/bash root
|
usermod -s /usr/bin/bash root
|
||||||
|
|
||||||
echo "---> Create liveuser --->"
|
echo "---> Create antergos --->"
|
||||||
useradd -m -p "" -g 'liveuser' -G 'sys,rfkill,wheel,uucp,nopasswdlogin,adm,tty' -s /bin/bash liveuser
|
useradd -m -p "" -g 'antergos' -G 'sys,rfkill,wheel,uucp,nopasswdlogin,adm,tty' -s /bin/bash antergos
|
||||||
if [[ -f "/root/liveuser.png" ]]; then
|
if [[ -f "/root/liveuser.png" ]]; then
|
||||||
cp "/root/liveuser.png" "/var/lib/AccountsService/icons/liveuser"
|
cp "/root/liveuser.png" "/var/lib/AccountsService/icons/antergos"
|
||||||
rm "/root/liveuser.png"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "---> Remove liveuser skel to clean for target skel --"
|
echo "---> Remove antergos skel to clean for target skel --"
|
||||||
pacman -Sy
|
pacman -Sy
|
||||||
pacman -Rns --noconfirm -- "antergos-skel-liveuser"
|
pacman -Rns --noconfirm -- "antergos-skel-liveuser"
|
||||||
rm -rf "/root/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"
|
mv "/root/livewall.png" "/usr/share/antergos/backgrounds/antergos-wallpaper-live.png"
|
||||||
chmod 644 "/usr/share/antergos/backgrounds/"*".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 --->"
|
echo "---> Install Antergos icon --->"
|
||||||
mkdir -p "/usr/share/antergos"
|
mkdir -p "/usr/share/antergos"
|
||||||
if [[ -f "/root/liveuser.png" ]]; then
|
if [[ -f "/root/liveuser.png" ]]; then
|
||||||
cp "/root/liveuser.png" "/usr/share/antergos/antergos-icon.png"
|
cp "/root/liveuser.png" "/usr/share/antergos/antergos-icon.png"
|
||||||
|
rm "/root/liveuser.png"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "---> install bash configs back into /etc/skel for offline install target --->"
|
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 "/mesa " | cut -c7- >> iso_package_versions
|
||||||
pacman -Qs | grep "/xorg-server " | 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
|
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 --->"
|
echo "---> Clean pacman log and package cache --->"
|
||||||
rm "/var/log/pacman.log"
|
rm "/var/log/pacman.log"
|
||||||
|
|||||||
Reference in New Issue
Block a user