diff --git a/archiso.md b/archiso.md index 45e7e33..dac2a53 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 54-1 +archiso-version=archiso 55-1 sudo pacman -Q archiso and you will know your version diff --git a/archiso/airootfs/etc/pacman-more.conf b/archiso/airootfs/etc/pacman-more.conf index 3a7d6c9..e76e6df 100644 --- a/archiso/airootfs/etc/pacman-more.conf +++ b/archiso/airootfs/etc/pacman-more.conf @@ -33,10 +33,10 @@ Architecture = auto # Misc options #UseSyslog #Color -#TotalDownload -# We cannot check disk space from within a chroot environment +#NoProgressBar #CheckSpace #VerbosePkgLists +ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. diff --git a/archiso/airootfs/etc/pacman.conf b/archiso/airootfs/etc/pacman.conf index 9d895e9..6377272 100644 --- a/archiso/airootfs/etc/pacman.conf +++ b/archiso/airootfs/etc/pacman.conf @@ -33,10 +33,10 @@ Architecture = auto # Misc options #UseSyslog #Color -#TotalDownload -# We cannot check disk space from within a chroot environment +#NoProgressBar #CheckSpace #VerbosePkgLists +ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. diff --git a/archiso/airootfs/etc/systemd/network/20-ethernet.network b/archiso/airootfs/etc/systemd/network/20-ethernet.network index 4fce10c..142c591 100644 --- a/archiso/airootfs/etc/systemd/network/20-ethernet.network +++ b/archiso/airootfs/etc/systemd/network/20-ethernet.network @@ -2,7 +2,8 @@ # SPDX-License-Identifier: GPL-3.0-or-later [Match] -Type=ether +Name=en* +Name=eth* [Network] DHCP=yes diff --git a/archiso/airootfs/etc/systemd/network/20-wlan.network b/archiso/airootfs/etc/systemd/network/20-wlan.network index 73a6bbd..c164666 100644 --- a/archiso/airootfs/etc/systemd/network/20-wlan.network +++ b/archiso/airootfs/etc/systemd/network/20-wlan.network @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later [Match] -Type=wlan +Name=wl* [Network] DHCP=yes diff --git a/archiso/airootfs/etc/systemd/network/20-wwan.network b/archiso/airootfs/etc/systemd/network/20-wwan.network index cc946fe..7fba35b 100644 --- a/archiso/airootfs/etc/systemd/network/20-wwan.network +++ b/archiso/airootfs/etc/systemd/network/20-wwan.network @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later [Match] -Type=wwan +Name=ww* [Network] DHCP=yes diff --git a/archiso/efiboot/loader/entries/archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf similarity index 94% rename from archiso/efiboot/loader/entries/archiso-x86_64-linux.conf rename to archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 9e83a2d..1a14b11 100644 --- a/archiso/efiboot/loader/entries/archiso-x86_64-linux.conf +++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -6,4 +6,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 +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/archiso/efiboot/loader/entries/archiso-x86_64-speech-linux.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf similarity index 100% rename from archiso/efiboot/loader/entries/archiso-x86_64-speech-linux.conf rename to archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf diff --git a/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf b/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf new file mode 100644 index 0000000..9eba5a9 --- /dev/null +++ b/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf @@ -0,0 +1,9 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Arch Linux install medium (x86_64, UEFI, Copy to RAM) +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% copytoram diff --git a/archiso/efiboot/loader/loader.conf b/archiso/efiboot/loader/loader.conf index 767d225..4f6252f 100644 --- a/archiso/efiboot/loader/loader.conf +++ b/archiso/efiboot/loader/loader.conf @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 15 -default archiso-x86_64-linux.conf +default 01-archiso-x86_64-linux.conf diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index edae07c..b62a386 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -83,6 +83,7 @@ partimage pcsclite ppp pptpclient +pv qemu-guest-agent reflector reiserfsprogs @@ -109,6 +110,7 @@ usb_modeswitch usbmuxd usbutils vim +virtualbox-guest-utils-nox vpnc wireless-regdb wireless_tools @@ -176,7 +178,7 @@ mkinitcpio-openswap #systemctl enable vboxservice #systemctl start vboxservice #to have fullscreen -virtualbox-guest-utils +#virtualbox-guest-utils #xf86-video-intel #xf86-video-amdgpu diff --git a/archiso/pacman.conf b/archiso/pacman.conf index e6a074e..bd08156 100644 --- a/archiso/pacman.conf +++ b/archiso/pacman.conf @@ -33,10 +33,10 @@ Architecture = auto # Misc options #UseSyslog #Color -#TotalDownload -# We cannot check disk space from within a chroot environment +#NoProgressBar #CheckSpace #VerbosePkgLists +ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg index fcbc678..a34d127 100644 --- a/archiso/syslinux/archiso_sys-linux.cfg +++ b/archiso/syslinux/archiso_sys-linux.cfg @@ -21,3 +21,14 @@ 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 + +# Copy to RAM boot option +LABEL arch64ram +TEXT HELP +Boot the Arch Linux install medium on BIOS with Copy-to-RAM option +It allows you to install Arch Linux or perform system maintenance. +ENDTEXT +MENU LABEL Arch Linux install medium (x86_64, BIOS, Copy to RAM) +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% copytoram 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 5f34020..5437d41 100755 --- a/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/installation-scripts/30-build-the-iso-the-first-time.sh @@ -35,7 +35,7 @@ echo #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' # setting of the general parameters - archisoRequiredVersion="archiso 54-1" + archisoRequiredVersion="archiso 55-1" buildFolder=$HOME"/alci-build" outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso) @@ -66,7 +66,6 @@ echo echo "the iso then change the version in line 37." echo "###################################################################################################" tput sgr0 - exit 1 fi echo diff --git a/installation-scripts/40-build-the-iso-local-again.sh b/installation-scripts/40-build-the-iso-local-again.sh index 3b31af0..62f5bf3 100755 --- a/installation-scripts/40-build-the-iso-local-again.sh +++ b/installation-scripts/40-build-the-iso-local-again.sh @@ -35,7 +35,7 @@ echo #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' # setting of the general parameters - archisoRequiredVersion="archiso 54-1" + archisoRequiredVersion="archiso 55-1" buildFolder=$HOME"/alci-build" outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso) @@ -66,7 +66,6 @@ echo echo "the iso then change the version in line 37." echo "###################################################################################################" tput sgr0 - exit 1 fi echo