diff options
| author | David P. <megver83@parabola.nu> | 2023-09-04 16:05:36 -0300 |
|---|---|---|
| committer | David P. <megver83@parabola.nu> | 2023-09-04 16:07:15 -0300 |
| commit | 7e31288d37e0158133a2a812cdd4057374560ef5 (patch) | |
| tree | a9359f91bfbbc824bcdecd1a46292fc8df23f5b5 /parabolaiso | |
| parent | ed78894a52dfceda2982344ce6605063198e22c2 (diff) | |
sync with archiso v68v68
ee4e4a9 Add changelog for 68
e0e4d20 configs/releng/airootfs/etc/mkinitcpio.conf: replace the deprecated archiso_kms hook with kms
2f9cfdf configs/: remove "Copy to RAM" boot entries since it is automatic now
1197161 mkarchiso: do not sign .sig files
f4f0a3a configs/: Do not explicitly enable qemu-guest-agent.service
Signed-off-by: David P. <megver83@parabola.nu>
Diffstat (limited to 'parabolaiso')
| -rwxr-xr-x | parabolaiso/mkparabolaiso | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index a2f27b4..26fa82d 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -372,7 +372,7 @@ _make_packages() { -r -- /proc/sys/fs/binfmt_misc 2> /dev/null \ | xargs -r grep -xF 'enabled') ]]; then # Register the qemu-arm-static as an ARM interpreter in the kernel (using binfmt_misc kernel module) - echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register + printf ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register fi install -d -m 0755 -- "${pacstrap_dir}/usr/bin" install -m 0755 -- /usr/bin/qemu-arm-static "${pacstrap_dir}/usr/bin" @@ -413,7 +413,9 @@ _make_packages() { fi # Delete the qemu-arm-static binary - rm -f -- "${pacstrap_dir}/usr/bin/qemu-arm-static" + if [[ "${arch}" == "armv7h" ]] && ! setarch armv7l /bin/true 2>/dev/null; then + rm -f -- "${pacstrap_dir}/usr/bin/qemu-arm-static" + fi _msg_info "Done! Packages installed successfully." } @@ -1085,7 +1087,8 @@ _sign_netboot_artifacts() { local _files_to_sign=() _msg_info "Signing netboot artifacts..." _dir="${isofs_dir}/${install_dir}/boot/" - 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 \ |