Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not rename the initramfs image

Browse Source 
This is a breaking change. archweb, archiso-manager and various documentation must be updated.

* https://github.com/archlinux/archweb/blob/master/templates/releng/archlinux.ipxe
* https://github.com/pierres/archiso-manager/blob/master/Makefile
This commit is contained in:
nl6720 2020-09-02 23:38:13 +03:00
parent 9544bbfdf1
commit 136152e672
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiso/mkarchiso
View File

@ -415,7 +415,7 @@ _make_bootmodes() {
_make_boot_on_iso() { _make_boot_on_iso() {
_msg_info "Preparing kernel and intramfs for the ISO 9660 file system..." _msg_info "Preparing kernel and intramfs for the ISO 9660 file system..."
install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}" install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/" install -m 0644 -- "${airootfs_dir}/boot/initramfs-linux.img" "${isofs_dir}/${install_dir}/boot/${arch}/"
install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/" install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/"
if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/" install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/"
@ -516,7 +516,7 @@ _make_boot_on_fat() {
_msg_info "Preparing kernel and intramfs for the FAT file system..." _msg_info "Preparing kernel and intramfs for the FAT file system..."
mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI/archiso mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI/archiso
mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \ mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
"${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/archiso.img" ::/EFI/archiso/ "${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/initramfs-linux.img" ::/EFI/archiso/
if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" ::/EFI/archiso/ mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" ::/EFI/archiso/
fi fi

2
configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset
View File

@ -8,4 +8,4 @@ PRESETS=('archiso')
ALL_kver='/boot/vmlinuz-linux' ALL_kver='/boot/vmlinuz-linux'
ALL_config='/etc/mkinitcpio.conf' ALL_config='/etc/mkinitcpio.conf'
archiso_image="/boot/archiso.img" archiso_image="/boot/initramfs-linux.img"

2
configs/baseline/syslinux/syslinux.cfg
View File

@ -11,5 +11,5 @@ TIMEOUT 30
LABEL arch LABEL arch
MENU LABEL Arch Linux MENU LABEL Arch Linux
LINUX boot/%ARCH%/vmlinuz-linux LINUX boot/%ARCH%/vmlinuz-linux
INITRD boot/%ARCH%/archiso.img INITRD boot/%ARCH%/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

2
configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
View File

@ -8,4 +8,4 @@ PRESETS=('archiso')
ALL_kver='/boot/vmlinuz-linux' ALL_kver='/boot/vmlinuz-linux'
ALL_config='/etc/mkinitcpio.conf' ALL_config='/etc/mkinitcpio.conf'
archiso_image="/boot/archiso.img" archiso_image="/boot/initramfs-linux.img"

2
configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
View File

@ -5,5 +5,5 @@ title Arch Linux install medium (x86_64, UEFI)
linux /EFI/archiso/vmlinuz-linux linux /EFI/archiso/vmlinuz-linux
initrd /EFI/archiso/intel-ucode.img initrd /EFI/archiso/intel-ucode.img
initrd /EFI/archiso/amd-ucode.img initrd /EFI/archiso/amd-ucode.img
initrd /EFI/archiso/archiso.img initrd /EFI/archiso/initramfs-linux.img
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

2
configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
View File

@ -5,5 +5,5 @@ title Arch Linux install medium (x86_64, UEFI)
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/intel-ucode.img
initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img
initrd /%INSTALL_DIR%/boot/x86_64/archiso.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

6
configs/releng/syslinux/archiso_pxe.cfg
View File

@ -10,7 +10,7 @@ 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 boot/x86_64/vmlinuz-linux LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify
SYSAPPEND 3 SYSAPPEND 3
@ -21,7 +21,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 boot/x86_64/vmlinuz-linux LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify
SYSAPPEND 3 SYSAPPEND 3
@ -32,7 +32,7 @@ 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 boot/x86_64/vmlinuz-linux LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify
SYSAPPEND 3 SYSAPPEND 3

2
configs/releng/syslinux/archiso_sys.cfg
View File

@ -13,7 +13,7 @@ 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 boot/x86_64/vmlinuz-linux LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
INCLUDE boot/syslinux/archiso_tail.cfg INCLUDE boot/syslinux/archiso_tail.cfg