Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst13
-rwxr-xr-xarchiso/mkarchiso7
l---------configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service1
-rw-r--r--configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf4
-rw-r--r--configs/baseline/grub/grub.cfg7
-rw-r--r--configs/baseline/syslinux/syslinux-linux.cfg6
-rw-r--r--configs/releng/airootfs/etc/mkinitcpio.conf2
l---------configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service1
-rw-r--r--configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf7
-rw-r--r--configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf7
-rw-r--r--configs/releng/syslinux/archiso_sys-linux.cfg11
11 files changed, 18 insertions, 48 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1b05ff4..0e9d737 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,17 @@ Changed
Removed
-------
+[68] - 2022-10-30
+=================
+
+Changed
+-------
+
+- Do not explicitly enable ``qemu-guest-agent.service`` as it will be started by a udev rule.
+- Remove existing signature (``.sig``) files and do not sign them when signing netboot artifacts. This is mostly
+ applicable when re-running ``mkarchiso`` after a failure.
+- Replace ``archiso_kms`` with ``kms`` in ``mkinitcpio.conf``. The hook is available in mkinitcpio since version 32.
+
[67] - 2022-09-25
=================
@@ -69,6 +80,8 @@ Removed
- Remove the custom pacman hook that ran ``locale-gen`` on glibc install from the releng profile. The used locale now
ships with the glibc package itself.
+- Remove "Copy to RAM" boot entries since the ``archiso`` mkinitcpio hook enables it automatically when there is enough
+ free RAM.
[64] - 2022-05-30
=================
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 33a0c1a..820688d 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -256,7 +256,7 @@ _mk_pgp_signature() {
local gpg_options=()
local airootfs_image_filename="${1}"
_msg_info "Signing rootfs image using GPG..."
-
+
rm -f -- "${airootfs_image_filename}.sig"
# Add gpg sender option if the value is provided
[[ -z "${gpg_sender}" ]] || gpg_options+=('--sender' "${gpg_sender}")
@@ -1056,7 +1056,7 @@ _cms_sign_artifact() {
fi
_msg_info "Signing ${artifact} image using openssl cms..."
-
+
rm -f -- "${artifact}.cms.sig"
openssl cms "${openssl_flags[@]}"
@@ -1075,7 +1075,8 @@ _sign_netboot_artifacts() {
_files_to_sign+=("${_dir}${_file}")
fi
done
- for _file in "${_files_to_sign[@]}" "${_dir}${arch}/vmlinuz-"* "${_dir}${arch}/initramfs-"*.img; do
+ for _file in "${_files_to_sign[@]}" "${_dir}${arch}/vmlinuz-"!(*.sig) "${_dir}${arch}/initramfs-"*.img; do
+ rm -f -- "${_file}".ipxe.sig
openssl cms \
-sign \
-binary \
diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
deleted file mode 120000
index 8e3ff80..0000000
--- a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file
diff --git a/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf b/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf
deleted file mode 100644
index d66f5a6..0000000
--- a/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Arch Linux (x86_64, UEFI) Copy to RAM
-linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
diff --git a/configs/baseline/grub/grub.cfg b/configs/baseline/grub/grub.cfg
index dead8ce..d2aa4ab 100644
--- a/configs/baseline/grub/grub.cfg
+++ b/configs/baseline/grub/grub.cfg
@@ -34,10 +34,3 @@ menuentry "Arch Linux (x86_64, UEFI)" --class arch --class gnu-linux --class gnu
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
}
-
-menuentry "Arch Linux (x86_64, UEFI) Copy to RAM" --class arch --class gnu-linux --class gnu --class os --id 'archlinux-copy-to-ram' {
- 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% copytoram
- initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-}
diff --git a/configs/baseline/syslinux/syslinux-linux.cfg b/configs/baseline/syslinux/syslinux-linux.cfg
index 6bfd0c3..0311f29 100644
--- a/configs/baseline/syslinux/syslinux-linux.cfg
+++ b/configs/baseline/syslinux/syslinux-linux.cfg
@@ -3,9 +3,3 @@ MENU LABEL Arch Linux (x86_64, BIOS)
LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux
INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-
-LABEL arch-ram
-MENU LABEL Arch Linux (x86_64, BIOS) Copy to RAM
-LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
diff --git a/configs/releng/airootfs/etc/mkinitcpio.conf b/configs/releng/airootfs/etc/mkinitcpio.conf
index f57dbdd..96a8752 100644
--- a/configs/releng/airootfs/etc/mkinitcpio.conf
+++ b/configs/releng/airootfs/etc/mkinitcpio.conf
@@ -49,7 +49,7 @@ FILES=()
#
## NOTE: If you have /usr on a separate partition, you MUST include the
# usr, fsck and shutdown hooks.
-HOOKS=(base udev modconf memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
+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
# Use this to compress the initramfs image. By default, gzip compression
diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
deleted file mode 120000
index 8e3ff80..0000000
--- a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file
diff --git a/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf b/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
deleted file mode 100644
index 3e26651..0000000
--- a/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf b/configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf
deleted file mode 100644
index 0d67999..0000000
--- a/configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/configs/releng/syslinux/archiso_sys-linux.cfg b/configs/releng/syslinux/archiso_sys-linux.cfg
index 6bff367..907fb25 100644
--- a/configs/releng/syslinux/archiso_sys-linux.cfg
+++ b/configs/releng/syslinux/archiso_sys-linux.cfg
@@ -18,14 +18,3 @@ MENU LABEL Arch Linux install medium (i686, BIOS) with ^speech
LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/i686/initramfs-linux.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on
-
-# Copy to RAM boot option
-LABEL arch32ram
-TEXT HELP
-Boot the Arch Linux install medium on BIOS with Copy-to-RAM option
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Arch Linux install medium (i686, BIOS, Copy to RAM)
-LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/i686/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram