From 487929cd1a27e4748610f9939c93b514f3a57032 Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Tue, 30 May 2023 08:33:27 +0200 Subject: [PATCH] archiso 70 to 71 --- archiso.md | 2 +- .../airootfs/etc/systemd/network/20-ethernet.network | 1 + archiso/airootfs/etc/systemd/network/20-wlan.network | 1 + .../etc/systemd/resolved.conf.d/archiso.conf | 4 ++++ archiso/airootfs/root/.automated_script.sh | 11 ++++++++++- .../loader/entries/01-archiso-x86_64-linux.conf | 2 +- .../entries/02-archiso-x86_64-speech-linux.conf | 2 +- archiso/grub/grub.cfg | 6 +++--- archiso/packages.x86_64 | 4 +++- archiso/pacman.conf | 2 -- archiso/syslinux/archiso_pxe-linux.cfg | 2 +- archiso/syslinux/archiso_sys-linux.cfg | 4 ++-- .../30-build-the-iso-the-first-time.sh | 12 +----------- installation-scripts/40-build-the-iso-local-again.sh | 12 +----------- 14 files changed, 30 insertions(+), 35 deletions(-) create mode 100644 archiso/airootfs/etc/systemd/resolved.conf.d/archiso.conf diff --git a/archiso.md b/archiso.md index 5d60eb1..c2c7b6b 100644 --- a/archiso.md +++ b/archiso.md @@ -9,7 +9,7 @@ https://www.archlinux.org/packages/extra/any/archiso/ We are now using this version -archiso-version=archiso 70-1 +archiso-version=archiso 71-1 sudo pacman -Q archiso and you will know your version diff --git a/archiso/airootfs/etc/systemd/network/20-ethernet.network b/archiso/airootfs/etc/systemd/network/20-ethernet.network index 9ada778..ce8de1f 100644 --- a/archiso/airootfs/etc/systemd/network/20-ethernet.network +++ b/archiso/airootfs/etc/systemd/network/20-ethernet.network @@ -7,6 +7,7 @@ Name=eth* [Network] DHCP=yes +MulticastDNS=yes IPv6PrivacyExtensions=yes # systemd-networkd does not set per-interface-type default route metrics diff --git a/archiso/airootfs/etc/systemd/network/20-wlan.network b/archiso/airootfs/etc/systemd/network/20-wlan.network index 601d5b8..e5990bf 100644 --- a/archiso/airootfs/etc/systemd/network/20-wlan.network +++ b/archiso/airootfs/etc/systemd/network/20-wlan.network @@ -3,6 +3,7 @@ Name=wl* [Network] DHCP=yes +MulticastDNS=yes IPv6PrivacyExtensions=yes # systemd-networkd does not set per-interface-type default route metrics diff --git a/archiso/airootfs/etc/systemd/resolved.conf.d/archiso.conf b/archiso/airootfs/etc/systemd/resolved.conf.d/archiso.conf new file mode 100644 index 0000000..636f3bd --- /dev/null +++ b/archiso/airootfs/etc/systemd/resolved.conf.d/archiso.conf @@ -0,0 +1,4 @@ +# Default systemd-resolved configuration for archiso + +[Resolve] +MulticastDNS=yes diff --git a/archiso/airootfs/root/.automated_script.sh b/archiso/airootfs/root/.automated_script.sh index 52c47e6..f257537 100755 --- a/archiso/airootfs/root/.automated_script.sh +++ b/archiso/airootfs/root/.automated_script.sh @@ -16,7 +16,13 @@ automated_script () script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then - curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script >/dev/null + # there's no synchronization for network availability before executing this script + printf '%s: waiting for network-online.target\n' "$0" + until systemctl --quiet is-active network-online.target; do + sleep 1 + done + printf '%s: downloading %s\n' "$0" "${script}" + curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script rt=$? else cp "${script}" /tmp/startup_script @@ -24,6 +30,9 @@ automated_script () fi if [[ ${rt} -eq 0 ]]; then chmod +x /tmp/startup_script + printf '%s: executing automated script\n' "$0" + # note that script is executed when other services (like pacman-init) may be still in progress, please + # synchronize to "systemctl is-system-running --wait" when your script depends on other services /tmp/startup_script fi fi diff --git a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 14b5f9f..08282a4 100644 --- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -4,4 +4,4 @@ linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index d6bc339..421e2c5 100644 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -4,4 +4,4 @@ linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n accessibility=on +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n accessibility=on diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 5bebae3..fd2bdb5 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -56,16 +56,16 @@ menuentry "Alci install medium with speakup screen reader (x86_64, UEFI)" --hotk if [ "${grub_platform}" == "efi" ]; then if [ "${grub_cpu}" == "x86_64" ]; then - menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool { + menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class memtest --class gnu --class tool { set gfxpayload=800x600,1024x768 linux /boot/memtest86+/memtest.efi } - menuentry "UEFI Shell" { + menuentry "UEFI Shell" --class efi { insmod chain chainloader /shellx64.efi } elif [ "${grub_cpu}" == "i386" ]; then - menuentry "UEFI Shell" { + menuentry "UEFI Shell" --class efi { insmod chain chainloader /shellia32.efi } diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 549161c..9254875 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -28,6 +28,7 @@ ethtool exfatprogs f2fs-tools fatresize +foot-terminfo fsarchiver gnu-netcat gpart @@ -114,6 +115,7 @@ usbutils vim virtualbox-guest-utils-nox vpnc +wezterm-terminfo wireless-regdb wireless_tools wpa_supplicant @@ -267,4 +269,4 @@ mkinitcpio-openswap git #grub theme -alci-grub-theme-git \ No newline at end of file +alci-grub-theme-git diff --git a/archiso/pacman.conf b/archiso/pacman.conf index 0807a4c..daedf1a 100644 --- a/archiso/pacman.conf +++ b/archiso/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index 0eb1705..305b8fd 100644 --- a/archiso/syslinux/archiso_pxe-linux.cfg +++ b/archiso/syslinux/archiso_pxe-linux.cfg @@ -6,7 +6,7 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NBD) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} cms_verify=y +APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 LABEL arch64_nfs diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg index 61ab3b3..68d8183 100644 --- a/archiso/syslinux/archiso_sys-linux.cfg +++ b/archiso/syslinux/archiso_sys-linux.cfg @@ -6,7 +6,7 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, BIOS) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n +APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n # Accessibility boot option LABEL arch64speech @@ -17,4 +17,4 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on cow_spacesize=4G copytoram=n +APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n diff --git a/installation-scripts/30-build-the-iso-the-first-time.sh b/installation-scripts/30-build-the-iso-the-first-time.sh index 70a4f69..ff88a3e 100755 --- a/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/installation-scripts/30-build-the-iso-the-first-time.sh @@ -24,18 +24,8 @@ tput sgr0 echo "################################################################## " echo - #Let us set the desktop" - #First letter of desktop is small letter - - #desktop="xfce" - #lightdmDesktop="xfce" - - #arcolinuxVersion='v21.03.1' - - #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' - # setting of the general parameters - archisoRequiredVersion="archiso 70-1" + archisoRequiredVersion="archiso 71-1" buildFolder=$HOME"/alci-build" outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso) diff --git a/installation-scripts/40-build-the-iso-local-again.sh b/installation-scripts/40-build-the-iso-local-again.sh index a9619a4..c60b9d6 100755 --- a/installation-scripts/40-build-the-iso-local-again.sh +++ b/installation-scripts/40-build-the-iso-local-again.sh @@ -24,18 +24,8 @@ tput sgr0 echo "################################################################## " echo - #Let us set the desktop" - #First letter of desktop is small letter - - #desktop="xfce" - #lightdmDesktop="xfce" - - #arcolinuxVersion='v21.03.1' - - #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' - # setting of the general parameters - archisoRequiredVersion="archiso 70-1" + archisoRequiredVersion="archiso 71-1" buildFolder=$HOME"/alci-build" outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso)