mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 11:30:37 +02:00
move ukify to function
This commit is contained in:
parent
5f7a9014ee
commit
263d1e6b2e
3 changed files with 8 additions and 6 deletions
|
@ -373,6 +373,12 @@ _create_cpio() {
|
||||||
echo "Build complete."
|
echo "Build complete."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_run_ukify() {
|
||||||
|
/usr/lib/systemd/ukify build --linux="${_KERNEL}" \
|
||||||
|
${_INTEL_UCODE} ${_AMD_UCODE} --initrd="${initrd}" --cmdline="${_CMDLINE}" \
|
||||||
|
--os-release=@"${_OSREL}" --splash="${_SPLASH}" --output="${_UKI}" &>"${_NO_LOG}"
|
||||||
|
}
|
||||||
|
|
||||||
_reproducibility() {
|
_reproducibility() {
|
||||||
# Reproducibility: set all timestamps to 0
|
# Reproducibility: set all timestamps to 0
|
||||||
fd . "${1}" -u --min-depth 1 -X touch -hcd "@0"
|
fd . "${1}" -u --min-depth 1 -X touch -hcd "@0"
|
||||||
|
|
|
@ -130,9 +130,7 @@ _create_iso() {
|
||||||
[[ "${initrd}" == "${_INITRD_LATEST}" ]] && _UKI="boot/${_NAME}-latest-${_ARCH}.efi"
|
[[ "${initrd}" == "${_INITRD_LATEST}" ]] && _UKI="boot/${_NAME}-latest-${_ARCH}.efi"
|
||||||
[[ "${initrd}" == "${_INITRD_LOCAL}" ]] && _UKI="boot/${_NAME}-local-${_ARCH}.efi"
|
[[ "${initrd}" == "${_INITRD_LOCAL}" ]] && _UKI="boot/${_NAME}-local-${_ARCH}.efi"
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
${_NSPAWN} "${_W_DIR}" /usr/lib/systemd/ukify build --linux="${_KERNEL}" \
|
${_NSPAWN} "${_W_DIR}" _run_ukify
|
||||||
${_INTEL_UCODE} ${_AMD_UCODE} --initrd="${initrd}" --cmdline="${_CMDLINE}" \
|
|
||||||
--os-release=@"${_OSREL}" --splash="${_SPLASH}" --output="${_UKI}" &>"${_NO_LOG}" || exit 1
|
|
||||||
done
|
done
|
||||||
# fix permission and timestamp
|
# fix permission and timestamp
|
||||||
mv "${_W_DIR}"/boot ./
|
mv "${_W_DIR}"/boot ./
|
||||||
|
|
|
@ -62,9 +62,7 @@ _systemd_ukify() {
|
||||||
[[ -n "/${_INTEL_UCODE}" ]] && _INTEL_UCODE="--initrd=/${_INTEL_UCODE}"
|
[[ -n "/${_INTEL_UCODE}" ]] && _INTEL_UCODE="--initrd=/${_INTEL_UCODE}"
|
||||||
_AMD_UCODE="--initrd=/${_AMD_UCODE}"
|
_AMD_UCODE="--initrd=/${_AMD_UCODE}"
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
/usr/lib/systemd/ukify build --linux="${_KERNEL}" \
|
_run_ukify || exit 1
|
||||||
${_INTEL_UCODE} ${_AMD_UCODE} --initrd="${_INITRD}" --cmdline="${_CMDLINE}" \
|
|
||||||
--os-release=@"${_OSREL}" --splash="${_SPLASH}" --output="${_UKI}" &>"${_NO_LOG}" || exit 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_create_cksum() {
|
_create_cksum() {
|
||||||
|
|
Loading…
Reference in a new issue