diff options
author | David P <megver83@parabola.nu> | 2021-12-28 18:22:25 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2021-12-28 18:22:25 -0300 |
commit | 83ee7d98a0e99d3a2434375582edda3f31d017db (patch) | |
tree | 69c7d50a75bb479d242be94db091da2a772167e6 | |
parent | 3a96fc770d96c548540768bcd062260db675eb9c (diff) |
sync with archiso v60v60
archiso:
324bab5 (HEAD -> master, tag: v60, origin/master, origin/HEAD) Merge branch 'version/60'
5b01770 (origin/version/60) Add changelog for version 60
3c0720b Add dummy changelog entry
f67f61f Merge branch 'nl6720_developer'
8d20de7 (origin/nl6720_developer) Add nl6720 to the list of maintainers
754caf0 Merge branch '151-mkarchiso-should-show-code-signing-certificates-none-if-no-keys-cerfificates-are-specified'
dae5494 mkarchiso: show "Code signing certificates: None" if no keys/certificates are specified
01d03eb Merge branch 'rm-archiso_shutdown'
e785ee2 configs/releng/airootfs/etc/mkinitcpio.conf: remove archiso_shutdown
Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r-- | CHANGELOG.rst | 29 | ||||
-rw-r--r-- | README.rst | 16 | ||||
-rw-r--r-- | configs/releng/airootfs/etc/mkinitcpio.conf | 2 | ||||
-rwxr-xr-x | parabolaiso/mkparabolaiso | 2 |
4 files changed, 43 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ce00b53..95d6dfd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,35 @@ ######### Changelog ######### + +[XX] - YYYY-MM-DD +================= + +Added +----- + +Changed +------- + +Removed +------- + +[60] - 2021-12-28 +================= + +Added +----- + +Changed +------- + +- Show a more descriptive message when no code signing certificate is used + +Removed +------- + +- Remove unused parabolaiso_shutdown hook from the releng profile's mkinitcpio config + [59] - 2021-11-30 ================= @@ -127,6 +127,7 @@ The iso image contains a GRUB environment block holding the iso name and version boot the iso image from GRUB with a version specific cow directory to mitigate overlay clashes. .. code:: sh + loopback loop parabola.iso load_env -f (loop)/parabola/grubenv linux (loop)/parabola/boot/x86_64/vmlinuz-linux-libre ... \ @@ -150,16 +151,23 @@ All past and present authors of parabolaiso are listed in `AUTHORS <AUTHORS.rst> Releases ======== -`Releases of parabolaiso <https://git.parabola.nu/parabolaiso.git/refs/tags>`_ are created by its current maintainer -`David P <https://www.parabola.nu/people/hackers/#megver83>`_. Tags are signed using the PGP key with the ID -``6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78``. +`Releases of parabolaiso <https://git.parabola.nu/parabolaiso.git/refs/tags>`_ are created by their current maintainers + +- `David P <https://www.parabola.nu/people/hackers/#megver83>`_ (``6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78``) + +Tags are signed using respective PGP keys. -To verify a tag, first import the relevant PGP key: +To verify a tag, first import the relevant PGP key(s): .. code:: sh gpg --auto-key-locate wkd --search-keys megver83@parabola.nu +or + +.. code:: sh + + gpg --auto-key-locate keyserver --recv-keys 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 Afterwards a tag can be verified from a clone of this repository: diff --git a/configs/releng/airootfs/etc/mkinitcpio.conf b/configs/releng/airootfs/etc/mkinitcpio.conf index 34645b9..f1d34eb 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 parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard) +HOOKS=(base udev modconf memdisk parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard) # COMPRESSION # Use this to compress the initramfs image. By default, gzip compression diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 1c332ae..349d987 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -125,7 +125,7 @@ _show_config() { _msg_info " Build modes: ${buildmodes[*]}" _msg_info " GPG key: ${gpg_key:-None}" _msg_info " GPG signer: ${gpg_sender:-None}" - _msg_info "Code signing certificates: ${cert_list[*]}" + _msg_info "Code signing certificates: ${cert_list[*]:-None}" _msg_info " Profile: ${profile}" _msg_info "Pacman configuration file: ${pacman_conf}" _msg_info " Image file name: ${image_name:-None}" |