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

By Christian Hesse
* origin/merge-requests/281:
  mkarchiso: touch clock-epoch for extra hint on date and time

See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/281

While it feels dirty to place files in /usr/lib/, since it is the package manager's teritory, the path is unfortunately hardcoded.
5170afbc55
This commit is contained in:
nl6720 2022-08-28 15:10:12 +03:00
commit 8ed192b705
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 6 additions and 0 deletions

View File

@ -10,6 +10,7 @@ Added
- Add ``efibootimg`` to ``mkarchiso`` to abstract the FAT image path.
- Copy all files from the ``grub`` directory to ISO9660 and the FAT image, not just only ``grub.cfg``.
- Touching ``/usr/lib/clock-epoch`` to to help ``systemd`` with screwed or broken RTC.
Changed
-------

View File

@ -1590,6 +1590,11 @@ _make_version() {
[[ ! -e "${_os_release}" ]] || sed -i '/^IMAGE_ID=/d;/^IMAGE_VERSION=/d' "${_os_release}"
printf 'IMAGE_ID=%s\nIMAGE_VERSION=%s\n' "${iso_name}" "${iso_version}" >> "${_os_release}"
fi
# Touch /usr/lib/clock-epoch to give another hint on date and time
# for systems with screwed or broken RTC.
touch -m -d"@${SOURCE_DATE_EPOCH}" -- "${pacstrap_dir}/usr/lib/clock-epoch"
_msg_info "Done!"
}