Merge remote-tracking branch 'origin/merge-requests/303'

By Christian Hesse
* origin/merge-requests/303:
  archiso/mkarchiso: write "uninitialized" to /etc/machine-id

See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/303
This commit is contained in:
nl6720 2022-12-24 10:30:22 +02:00
commit 995e0b7fb9
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 6 additions and 2 deletions

View File

@ -18,6 +18,9 @@ Changed
- Error out early if any of the code signing certificate files passed with option ``-c`` do not exist.
- Use LZMA compressed EROFS image for the baseline profile. Now that xz 5.4 is out and erofs-utils is built with LZMA
support, using a higher compression is possible.
- Add ``/etc/machine-id`` with special value ``uninitialized``. The final id is generated at boot time, and systemd's
first-boot mechanim (see ``First Boot Semantics`` in ``machine-id(5)``) applies. No functional change unless that
``ConditionFirstBoot=yes`` is true and passive unit ``first-boot-complete.target`` activates for ordering.
Removed
-------

View File

@ -163,9 +163,10 @@ _cleanup_pacstrap_dir() {
[[ -d "${pacstrap_dir}/var/tmp" ]] && find "${pacstrap_dir}/var/tmp" -mindepth 1 -delete
# Delete package pacman related files.
find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
# Create an empty /etc/machine-id
# Create /etc/machine-id with special value 'uninitialized': the final id is
# generated on first boot, systemd's first-boot mechanism applies (see machine-id(5))
rm -f -- "${pacstrap_dir}/etc/machine-id"
printf '' > "${pacstrap_dir}/etc/machine-id"
printf 'uninitialized\n' > "${pacstrap_dir}/etc/machine-id"
_msg_info "Done!"
}