diff --git a/1-get-all-alci-gits-v1.sh b/1-get-all-alci-gits-v1.sh index fd9b337..21cc88e 100755 --- a/1-get-all-alci-gits-v1.sh +++ b/1-get-all-alci-gits-v1.sh @@ -18,7 +18,6 @@ echo "Fill the array with the original folders first" directories=( alci-calamares-config/ -alci-calamares-config-btrfs/ alci-calamares-config-dev/ alci-calamares-config-hardened/ alci-calamares-config-lts/ diff --git a/archiso.md b/archiso.md index 8dfca7d..c2aea5d 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 63-2 +archiso-version=archiso 64-1 sudo pacman -Q archiso and you will know your version 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 d59262f..1c2a7a8 100644 --- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,6 +1,7 @@ -title Arch Linux install medium (x86_64, UEFI) -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% +title Arch Linux install medium (x86_64, UEFI) +sort-key 01 +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% 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 06f5466..64253d3 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 @@ -1,6 +1,7 @@ -title Arch Linux install medium (x86_64, UEFI) with speech -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% accessibility=on +title Arch Linux install medium (x86_64, UEFI) with speech +sort-key 02 +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% accessibility=on 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 index 9c7a51a..3e26651 100644 --- a/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf +++ b/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf @@ -1,6 +1,7 @@ -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 +title Arch Linux install medium (x86_64, UEFI, Copy to RAM) +sort-key 03 +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/entries/04-archiso-x86_64-ram-speech-linux.conf b/archiso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf new file mode 100644 index 0000000..0d67999 --- /dev/null +++ b/archiso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf @@ -0,0 +1,7 @@ +title Arch Linux install medium (x86_64, UEFI, Copy to RAM) with speech +sort-key 04 +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 accessibility=on diff --git a/archiso/efiboot/loader/loader.conf b/archiso/efiboot/loader/loader.conf index ae63487..2d137aa 100644 --- a/archiso/efiboot/loader/loader.conf +++ b/archiso/efiboot/loader/loader.conf @@ -1,2 +1,3 @@ timeout 15 default 01-archiso-x86_64-linux.conf +beep on diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg new file mode 100644 index 0000000..4a707b9 --- /dev/null +++ b/archiso/grub/grub.cfg @@ -0,0 +1,46 @@ +insmod part_gpt +insmod part_msdos +insmod fat +insmod iso9660 + +insmod all_video + +insmod font + +if loadfont "${prefix}/fonts/unicode.pf2" ; then + insmod gfxterm + set gfxmode="auto" + terminal_input console + terminal_output gfxterm +fi + +# GRUB init tune for accessibility +# +# Morse translation table: +# "." is "500 1 300 1" +# "-" is "600 3 300 1" +# " " is "100 2" +# "/" is "100 5" +# +# Message: "s for blind" +play 500 500 1 300 1 500 1 300 1 500 1 300 1 100 5 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 600 3 300 1 500 1 300 1 100 5 600 3 300 1 500 1 300 1 500 1 300 1 500 1 300 1 100 2 500 1 300 1 600 3 300 1 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 2 600 3 300 1 500 1 300 1 100 2 600 3 300 1 500 1 300 1 500 1 300 1 + +menuentry "Arch Linux install medium (x86_64, UEFI)" { + set gfxpayload=keep + search --no-floppy --set=root --label %ARCHISO_LABEL% + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +} + +menuentry "Arch Linux install medium with speakup screen reader (x86_64, UEFI)" --hotkey=s { + set gfxpayload=keep + search --no-floppy --set=root --label %ARCHISO_LABEL% + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +} + +menuentry "UEFI Shell" { + insmod chain + search --no-floppy --set=root --label %ARCHISO_LABEL% + chainloader /shellia32.efi +} diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 78d112f..d9f204e 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -4,7 +4,7 @@ arch-install-scripts archinstall b43-fwcutter base -bind-tools +bind brltty broadcom-wl btrfs-progs diff --git a/archiso/profiledef.sh b/archiso/profiledef.sh index fd28c05..7bb071e 100644 --- a/archiso/profiledef.sh +++ b/archiso/profiledef.sh @@ -8,7 +8,9 @@ iso_application="Arch Linux Live/Rescue CD" iso_version="$(date +%Y.%m.%d)" install_dir="arch" buildmodes=('iso') -bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') +bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' + 'uefi-ia32.grub.esp' 'uefi-x64.systemd-boot.esp' + 'uefi-ia32.grub.eltorito' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" pacman_conf="pacman.conf" airootfs_image_type="squashfs" diff --git a/git-v2.sh b/git-v2.sh index 1ff0bc7..55a3c5f 100755 --- a/git-v2.sh +++ b/git-v2.sh @@ -39,7 +39,15 @@ git commit -m "$input" # Push the local files to github -git push -u origin master +if grep -q main .git/config; then + echo "Using main" + git push -u origin main +fi + +if grep -q master .git/config; then + echo "Using master" + git push -u origin master +fi echo "################################################################" 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 194a637..ce25afb 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 63-2" + archisoRequiredVersion="archiso 64-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 c244f45..74677c3 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 63-2" + archisoRequiredVersion="archiso 64-1" buildFolder=$HOME"/alci-build" outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso)