simono41/SpectreOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add default locales and fix check internet connections

Browse source
This commit is contained in:
user1 2023-03-29 23:26:17 +02:00
parent df6bfb52ab
commit 6648328d02
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch-install.sh
View file

@ -774,6 +774,11 @@ function grubinstall() {
parameter="${parameter}cryptkey=UUID=${usbkeyuuid}:${usbkeydateisystem}:\/archkey " parameter="${parameter}cryptkey=UUID=${usbkeyuuid}:${usbkeydateisystem}:\/archkey "
fi fi
[[ -z "${autostartdesktop}" ]] && autostartdesktop=sway
[[ -z "${lang}" ]] && lang=de_DE
[[ -z "${keytable}" ]] && keytable=de
[[ -z "${tz}" ]] && tz=Europe/Berlin
parameter="${parameter}autostartdesktop=${autostartdesktop} lang=${lang} keytable=${keytable} tz=${tz} " parameter="${parameter}autostartdesktop=${autostartdesktop} lang=${lang} keytable=${keytable} tz=${tz} "
sed -i '/GRUB_CMDLINE_LINUX=/d' ${mountpoint}/etc/default/grub sed -i '/GRUB_CMDLINE_LINUX=/d' ${mountpoint}/etc/default/grub
@ -1430,7 +1435,7 @@ if [ "${fastinstall}" == "y" ] && [ "${fastinstallnext}" != "y" ]; then
/opt/${repo}/arch-install.sh "${1} fastinstallnext=y " /opt/${repo}/arch-install.sh "${1} fastinstallnext=y "
exit 0 exit 0
elif [ "${phaseone}" != "n" ] && [ "${fastinstallnext}" != "y" ]; then elif [ "${phaseone}" != "n" ] && [ "${fastinstallnext}" != "y" ]; then
if wget -qO- ipv4.icanhazip.com 1>/dev/null 2>&1; then if ping -q -c 1 -W 1 8.8.8.8 >/dev/null; then
read -p "Should I look at the internet for a new install script and then run it ?: [Y/n] " update read -p "Should I look at the internet for a new install script and then run it ?: [Y/n] " update
if [ "${update}" == "debug" ] if [ "${update}" == "debug" ]
then then
@ -1440,13 +1445,7 @@ elif [ "${phaseone}" != "n" ] && [ "${fastinstallnext}" != "y" ]; then
then then
read -p "Should I update youre packages and then run it ?: [y/N] " updatepackages read -p "Should I update youre packages and then run it ?: [y/N] " updatepackages
if [ "${updatepackages}" == "y" ]; then if [ "${updatepackages}" == "y" ]; then
echo "Please dont update the linux kernel!!!" pacman -Sy arch-install-scripts squashfs-tools dosfstools libisoburn grub efibootmgr dosfstools gptfdisk cronie memtest86+
if [ -f /opt/${repo}/packages.txt ]; then
pacman -Syu $(cat /opt/${repo}/packages.txt) --noconfirm --needed --ignore linux
else
echo "Kann keine neuen Packete nachinstallieren weil die base.txt nicht gefunden werden kann!!"
echo "Es kann sein das dass Programm nicht korrekt funktioniert!!!"
fi
fi fi
gitclone gitclone
/opt/${repo}/arch-install.sh "${1} phaseone=n " /opt/${repo}/arch-install.sh "${1} phaseone=n "