June release
This commit is contained in:
parent
1805b0b25e
commit
9c0d032bb2
13 changed files with 91 additions and 25 deletions
|
@ -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/
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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%
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -1,2 +1,3 @@
|
|||
timeout 15
|
||||
default 01-archiso-x86_64-linux.conf
|
||||
beep on
|
||||
|
|
46
archiso/grub/grub.cfg
Normal file
46
archiso/grub/grub.cfg
Normal file
|
@ -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
|
||||
}
|
|
@ -4,7 +4,7 @@ arch-install-scripts
|
|||
archinstall
|
||||
b43-fwcutter
|
||||
base
|
||||
bind-tools
|
||||
bind
|
||||
brltty
|
||||
broadcom-wl
|
||||
btrfs-progs
|
||||
|
|
|
@ -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"
|
||||
|
|
10
git-v2.sh
10
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 "################################################################"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue