udpate
This commit is contained in:
parent
9b49377317
commit
b31b0fb4a0
10 changed files with 35 additions and 38 deletions
2
archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf
Normal file
2
archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
HOOKS=(base udev microcode modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
|
||||||
|
COMPRESSION="xz"
|
|
@ -1,7 +1,5 @@
|
||||||
title Arch Linux install medium (x86_64, UEFI)
|
title Arch Linux install medium (x86_64, UEFI)
|
||||||
sort-key 01
|
sort-key 01
|
||||||
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
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
|
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n
|
options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n
|
||||||
|
|
|
@ -4,4 +4,4 @@ linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
||||||
initrd /%INSTALL_DIR%/boot/intel-ucode.img
|
initrd /%INSTALL_DIR%/boot/intel-ucode.img
|
||||||
initrd /%INSTALL_DIR%/boot/amd-ucode.img
|
initrd /%INSTALL_DIR%/boot/amd-ucode.img
|
||||||
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n accessibility=on
|
options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
title Memtest86+
|
||||||
|
sort-key 03
|
||||||
|
efi /boot/memtest86+/memtest.efi
|
|
@ -27,15 +27,6 @@ if serial --unit=0 --speed=115200; then
|
||||||
terminal_output --append serial
|
terminal_output --append serial
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Search for the ISO volume
|
|
||||||
if [ -z "${ARCHISO_UUID}" ]; then
|
|
||||||
if [ -z "${ARCHISO_HINT}" ]; then
|
|
||||||
regexp --set=1:ARCHISO_HINT '^\(([^)]+)\)' "${cmdpath}"
|
|
||||||
fi
|
|
||||||
search --no-floppy --set=root --file '%ARCHISO_SEARCH_FILENAME%' --hint "${ARCHISO_HINT}"
|
|
||||||
probe --set ARCHISO_UUID --fs-uuid "${root}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get a human readable platform identifier
|
# Get a human readable platform identifier
|
||||||
if [ "${grub_platform}" == 'efi' ]; then
|
if [ "${grub_platform}" == 'efi' ]; then
|
||||||
archiso_platform='UEFI'
|
archiso_platform='UEFI'
|
||||||
|
@ -60,16 +51,16 @@ timeout_style=menu
|
||||||
|
|
||||||
# Menu entries
|
# Menu entries
|
||||||
|
|
||||||
menuentry "Alci Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'alci' {
|
menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
|
||||||
set gfxpayload=keep
|
set gfxpayload=keep
|
||||||
linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=4G copytoram=n
|
linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n
|
||||||
initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
|
initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
|
||||||
}
|
}
|
||||||
|
|
||||||
menuentry "Alci Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'alci-accessibility' {
|
menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
|
||||||
set gfxpayload=keep
|
set gfxpayload=keep
|
||||||
linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on cow_spacesize=4G copytoram=n
|
linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n
|
||||||
initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
|
initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -101,15 +92,16 @@ if [ "${grub_platform}" == 'efi' ]; then
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
menuentry 'System shutdown' --class shutdown --class poweroff {
|
||||||
|
echo 'System shutting down...'
|
||||||
|
halt
|
||||||
|
}
|
||||||
|
|
||||||
menuentry 'System restart' --class reboot --class restart {
|
menuentry 'System restart' --class reboot --class restart {
|
||||||
echo 'System rebooting...'
|
echo 'System rebooting...'
|
||||||
reboot
|
reboot
|
||||||
}
|
}
|
||||||
|
|
||||||
menuentry 'System shutdown' --class shutdown --class poweroff {
|
|
||||||
echo 'System shutting down...'
|
|
||||||
halt
|
|
||||||
}
|
|
||||||
# GRUB init tune for accessibility
|
# GRUB init tune for accessibility
|
||||||
play 600 988 1 1319 4
|
play 600 988 1 1319 4
|
||||||
|
|
|
@ -31,13 +31,13 @@ timeout_style=menu
|
||||||
menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
|
menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
|
||||||
set gfxpayload=keep
|
set gfxpayload=keep
|
||||||
linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}"
|
linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}"
|
||||||
initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
|
initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
|
||||||
}
|
}
|
||||||
|
|
||||||
menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
|
menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
|
||||||
set gfxpayload=keep
|
set gfxpayload=keep
|
||||||
linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on
|
linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on
|
||||||
initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
|
initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ Architecture = auto
|
||||||
#UseSyslog
|
#UseSyslog
|
||||||
#Color
|
#Color
|
||||||
#NoProgressBar
|
#NoProgressBar
|
||||||
|
# We cannot check disk space from within a chroot environment
|
||||||
#CheckSpace
|
#CheckSpace
|
||||||
#VerbosePkgLists
|
#VerbosePkgLists
|
||||||
ParallelDownloads = 8
|
ParallelDownloads = 8
|
||||||
|
|
|
@ -2,19 +2,20 @@
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
|
|
||||||
iso_name="archlinux"
|
iso_name="archlinux"
|
||||||
iso_label="ARCH_$(date +%Y%m)"
|
iso_label="ARCH_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)"
|
||||||
iso_publisher="Arch Linux <https://archlinux.org>"
|
iso_publisher="Arch Linux <https://archlinux.org>"
|
||||||
iso_application="Arch Linux Live/Rescue CD"
|
iso_application="Arch Linux Live/Rescue DVD"
|
||||||
iso_version="$(date +%Y.%m.%d)"
|
iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
|
||||||
install_dir="arch"
|
install_dir="arch"
|
||||||
buildmodes=('iso')
|
buildmodes=('iso')
|
||||||
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
|
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
|
||||||
'uefi-ia32.grub.esp' 'uefi-x64.grub.esp'
|
'uefi-ia32.systemd-boot.esp' 'uefi-x64.systemd-boot.esp'
|
||||||
'uefi-ia32.grub.eltorito' 'uefi-x64.grub.eltorito')
|
'uefi-ia32.systemd-boot.eltorito' 'uefi-x64.systemd-boot.eltorito')
|
||||||
arch="x86_64"
|
arch="x86_64"
|
||||||
pacman_conf="pacman.conf"
|
pacman_conf="pacman.conf"
|
||||||
airootfs_image_type="squashfs"
|
airootfs_image_type="squashfs"
|
||||||
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
|
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
|
||||||
|
bootstrap_tarball_compression=('zstd' '-c' '-T0' '--auto-threads=logical' '--long' '-19')
|
||||||
file_permissions=(
|
file_permissions=(
|
||||||
["/etc/shadow"]="0:0:400"
|
["/etc/shadow"]="0:0:400"
|
||||||
["/root"]="0:0:750"
|
["/root"]="0:0:750"
|
||||||
|
|
|
@ -5,8 +5,8 @@ It allows you to install Arch Linux or perform system maintenance.
|
||||||
ENDTEXT
|
ENDTEXT
|
||||||
MENU LABEL Arch Linux install medium (x86_64, NBD)
|
MENU LABEL Arch Linux install medium (x86_64, NBD)
|
||||||
LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
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
|
INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y
|
APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y
|
||||||
SYSAPPEND 3
|
SYSAPPEND 3
|
||||||
|
|
||||||
LABEL arch64_nfs
|
LABEL arch64_nfs
|
||||||
|
@ -16,7 +16,7 @@ It allows you to install Arch Linux or perform system maintenance.
|
||||||
ENDTEXT
|
ENDTEXT
|
||||||
MENU LABEL Arch Linux install medium (x86_64, NFS)
|
MENU LABEL Arch Linux install medium (x86_64, NFS)
|
||||||
LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
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
|
INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y
|
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y
|
||||||
SYSAPPEND 3
|
SYSAPPEND 3
|
||||||
|
|
||||||
|
@ -27,6 +27,6 @@ It allows you to install Arch Linux or perform system maintenance.
|
||||||
ENDTEXT
|
ENDTEXT
|
||||||
MENU LABEL Arch Linux install medium (x86_64, HTTP)
|
MENU LABEL Arch Linux install medium (x86_64, HTTP)
|
||||||
LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
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
|
INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y
|
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y
|
||||||
SYSAPPEND 3
|
SYSAPPEND 3
|
||||||
|
|
|
@ -5,8 +5,8 @@ It allows you to install Arch Linux or perform system maintenance.
|
||||||
ENDTEXT
|
ENDTEXT
|
||||||
MENU LABEL Arch Linux install medium (x86_64, BIOS)
|
MENU LABEL Arch Linux install medium (x86_64, BIOS)
|
||||||
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
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
|
INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n
|
APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n
|
||||||
|
|
||||||
# Accessibility boot option
|
# Accessibility boot option
|
||||||
LABEL arch64speech
|
LABEL arch64speech
|
||||||
|
@ -16,5 +16,5 @@ It allows you to install Arch Linux or perform system maintenance with speech fe
|
||||||
ENDTEXT
|
ENDTEXT
|
||||||
MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech
|
MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech
|
||||||
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
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
|
INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n
|
APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n
|
||||||
|
|
Loading…
Reference in a new issue