diff options
| author | David Runge <dvzrv@archlinux.org> | 2021-06-29 20:13:48 +0200 |
|---|---|---|
| committer | David Runge <dvzrv@archlinux.org> | 2021-06-29 20:13:48 +0200 |
| commit | e2649140dcc45efbec4f184374aa10120ac47417 (patch) | |
| tree | e55e2fcbf45dd31ef2345ee1a37481b7d1820c5a | |
| parent | 9c44aeedd182e70194d2b90ca919dcad7ced42b1 (diff) | |
| parent | cbac95ec9d8f5ab2245f23b705d5969e79d49b26 (diff) | |
| download | archiso-e2649140dcc45efbec4f184374aa10120ac47417.tar.gz archiso-e2649140dcc45efbec4f184374aa10120ac47417.tar.bz2 | |
Merge remote-tracking branch 'nl6720/env-i-SOURCE_DATE_EPOCH'
* nl6720/env-i-SOURCE_DATE_EPOCH:
mkarchiso: pass SOURCE_DATE_EPOCH to chroot
| -rwxr-xr-x | archiso/mkarchiso | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 29e7dc4..6d8c977 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -320,7 +320,7 @@ _make_custom_airootfs() { # Install desired packages to airootfs _make_packages() { - local envvars_in_chroot=() + local envvars_in_chroot=("SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}") _msg_info "Installing packages to '${pacstrap_dir}/'..." if [[ -n "${gpg_key}" ]]; then @@ -373,7 +373,7 @@ _make_customize_airootfs() { _msg_info "Running customize_airootfs.sh in '${pacstrap_dir}' chroot..." _msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version." chmod -f -- +x "${pacstrap_dir}/root/customize_airootfs.sh" - eval -- env -i arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh" + eval -- env -i "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}" arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh" rm -- "${pacstrap_dir}/root/customize_airootfs.sh" _msg_info "Done! customize_airootfs.sh run successfully." fi |