Skip to content

Commit

Permalink
fixed the initramfs
Browse files Browse the repository at this point in the history
  • Loading branch information
behdanisohrab committed May 16, 2024
1 parent 34e9dc9 commit 21ae0ea
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 18 deletions.
2 changes: 2 additions & 0 deletions iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf
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"
2 changes: 0 additions & 2 deletions iso/airootfs/etc/mkinitcpio.conf.d/parchiso.conf

This file was deleted.

4 changes: 2 additions & 2 deletions iso/airootfs/etc/mkinitcpio.d/linux.preset
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# mkinitcpio preset file for the 'linux' package on archiso

PRESETS=('parchiso')
PRESETS=('archiso')

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

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

2 changes: 0 additions & 2 deletions iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
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%
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
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
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
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
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
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
18 changes: 15 additions & 3 deletions iso/syslinux/archiso_sys-linux.cfg
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

0 comments on commit 21ae0ea

Please sign in to comment.