Skip to content

Commit

Permalink
synced mate with template
Browse files Browse the repository at this point in the history
  • Loading branch information
@behdanisohrab
behdanisohrab committed Jun 16, 2024
1 parent 3f1ed9a commit 63d76a0
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 101 deletions.
67 changes: 0 additions & 67 deletions iso/airootfs/etc/mkinitcpio.conf
View file

This file was deleted.

2 changes: 2 additions & 0 deletions iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
COMPRESSION="xz"
3 changes: 2 additions & 1 deletion iso/airootfs/etc/mkinitcpio.d/linux.preset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
PRESETS=('archiso')

ALL_kver='/boot/vmlinuz-linux'
ALL_config='/etc/mkinitcpio.conf'
archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'

archiso_image="/boot/initramfs-linux.img"

14 changes: 0 additions & 14 deletions iso/airootfs/etc/mkinitcpio.d/parch
View file

This file was deleted.

2 changes: 0 additions & 2 deletions iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
title Parch 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%
2 changes: 0 additions & 2 deletions iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
title Parch 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
2 changes: 0 additions & 2 deletions iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
title Parch 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
2 changes: 0 additions & 2 deletions iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
title Parch 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
5 changes: 5 additions & 0 deletions iso/efiboot/loader/entries/05-archiso-x86_64-compatibility-mode-linux.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
title Parch Linux install compatibility medium (x86_64, UEFI)
sort-key 05
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodset
2 changes: 1 addition & 1 deletion iso/efiboot/loader/loader.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
timeout 15
default 01-archiso-x86_64-linux.conf
beep off
beep on
4 changes: 2 additions & 2 deletions iso/grub/grub.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ menuentry "Parch 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
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
}

menuentry "Parch 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
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
}

menuentry "UEFI Shell" {
Expand Down
6 changes: 3 additions & 3 deletions iso/pacman.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Architecture = auto
#NoProgressBar
CheckSpace
#VerbosePkgLists
ParallelDownloads = 5
#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.
Expand Down Expand Up @@ -87,8 +87,8 @@ Include = /etc/pacman.d/mirrorlist
#[multilib-testing]
#Include = /etc/pacman.d/mirrorlist

#[multilib]
#Include = /etc/pacman.d/mirrorlist
[multilib]
Include = /etc/pacman.d/mirrorlist

[ppr]
SigLevel = Optional TrustedOnly
Expand Down
4 changes: 2 additions & 2 deletions iso/profiledef.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ iso_version="$(date +%Y.%m.%d)"
install_dir="arch"
buildmodes=('iso')
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')
'uefi-x64.systemd-boot.esp'
'uefi-x64.systemd-boot.eltorito')
arch="x86_64"
pacman_conf="pacman.conf"
airootfs_image_type="squashfs"
Expand Down
18 changes: 15 additions & 3 deletions iso/syslinux/archiso_sys-linux.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ It allows you to install Parch Linux or perform system maintenance.
ENDTEXT
MENU LABEL Parch 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
INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

# Accessibility boot option
Expand All @@ -16,7 +16,7 @@ It allows you to install Parch Linux or perform system maintenance with speech f
ENDTEXT
MENU LABEL Parch 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
INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on

# Copy to RAM boot option
Expand All @@ -27,5 +27,17 @@ It allows you to install Parch Linux or perform system maintenance.
ENDTEXT
MENU LABEL Parch 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
INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram


# compatibility boot option
LABEL arch64compatibility
TEXT HELP
Boot the Parch Linux install medium on BIOS with compatibility mode.
It allows you to install Parch Linux or perform system maintenance.
ENDTEXT
MENU LABEL Parch Linux install medium (x86_64, BIOS, compatibility)
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodset
Binary file modified iso/syslinux/splash.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 63d76a0

Please sign in to comment.