root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

update ukify syntax

Browse source
This commit is contained in:
Tobias Powalowski 2023-09-07 10:20:56 +02:00
parent 6e46dfff38
commit 13dae462a5
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
usr/lib/archboot/release.sh
View file

@ -113,16 +113,19 @@ _create_iso() {
cp /usr/share/licenses/intel-ucode/* boot/licenses/intel-ucode/ cp /usr/share/licenses/intel-ucode/* boot/licenses/intel-ucode/
_EFISTUB="/usr/lib/systemd/boot/efi/linuxx64.efi.stub" _EFISTUB="/usr/lib/systemd/boot/efi/linuxx64.efi.stub"
echo "console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=auto" > ${_CMDLINE} echo "console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=auto" > ${_CMDLINE}
_UCODE="${_INTEL_UCODE} ${_AMD_UCODE}" _AMD_UCODE="${_AMD_UCODE}"
fi _INTEL_UCODE="${_INTEL_UCODE}"
if [[ "${_ARCH}" == "aarch64" ]]; then if [[ "${_ARCH}" == "aarch64" ]]; then
echo "nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4 audit=0 systemd.show_status=auto" > ${_CMDLINE} echo "nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4 audit=0 systemd.show_status=auto" > ${_CMDLINE}
_EFISTUB="/usr/lib/systemd/boot/efi/linuxaa64.efi.stub" _EFISTUB="/usr/lib/systemd/boot/efi/linuxaa64.efi.stub"
_UCODE="${_AMD_UCODE}" _AMD_UCODE="${_AMD_UCODE}"
_INTEL_UCODE=""
# replace aarch64 Image.gz with Image kernel for UKI, compressed image is not working at the moment # replace aarch64 Image.gz with Image kernel for UKI, compressed image is not working at the moment
cp "${_W_DIR}/boot/Image" "boot/Image-archboot-${_ARCH}" cp "${_W_DIR}/boot/Image" "boot/Image-archboot-${_ARCH}"
_KERNEL_ARCHBOOT="boot/Image-archboot-${_ARCH}" _KERNEL_ARCHBOOT="boot/Image-archboot-${_ARCH}"
fi fi
[[ -n "${_INTEL_UCODE}" ]] && _INTEL_UCODE="--initrd=${_INTEL_UCODE}"
[[ -n "${_AMD_UCODE}" ]] && _AMD_UCODE="--initrd=${_AMD_UCODE}"
rm -r "${_W_DIR:?}"/boot rm -r "${_W_DIR:?}"/boot
mv boot "${_W_DIR}" mv boot "${_W_DIR}"
for initrd in ${_INITRD} ${_INITRD_LATEST} ${_INITRD_LOCAL}; do for initrd in ${_INITRD} ${_INITRD_LATEST} ${_INITRD_LOCAL}; do
@ -130,9 +133,9 @@ _create_iso() {
[[ "${initrd}" == "${_INITRD_LATEST}" ]] && _UKI="boot/archboot-latest-${_ARCH}.efi" [[ "${initrd}" == "${_INITRD_LATEST}" ]] && _UKI="boot/archboot-latest-${_ARCH}.efi"
[[ "${initrd}" == "${_INITRD_LOCAL}" ]] && _UKI="boot/archboot-local-${_ARCH}.efi" [[ "${initrd}" == "${_INITRD_LOCAL}" ]] && _UKI="boot/archboot-local-${_ARCH}.efi"
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_NSPAWN} "${_W_DIR}" /usr/lib/systemd/ukify ${_KERNEL_ARCHBOOT} \ ${_NSPAWN} "${_W_DIR}" /usr/lib/systemd/ukify build --linux=${_KERNEL_ARCHBOOT} \
${_UCODE} ${initrd} --cmdline @${_CMDLINE} --splash ${_SPLASH} \ ${_INTEL_UCODE} ${_AMD_UCODE} --initrd=${initrd} --uname=${_KERNEL_VERSION} --cmdline=@${_CMDLINE} \
--os-release @${_OSREL} --stub ${_EFISTUB} --output ${_UKI} &>"${_NO_LOG}" || exit 1 --splash=${_SPLASH} --os-release=@${_OSREL} --output=${_UKI} &>"${_NO_LOG}" || exit 1
done done
# fix permission and timestamp # fix permission and timestamp
mv "${_W_DIR}"/boot ./ mv "${_W_DIR}"/boot ./