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

fix release script

Browse source
This commit is contained in:
Tobias Powalowski 2024-09-07 15:36:40 +02:00
parent b23c0114ce
commit 17fb9f9b91
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/common.sh
View file

@ -2,12 +2,12 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
. /etc/archboot/defaults . /etc/archboot/defaults
_AMD_UCODE="/boot/amd-ucode.img" _AMD_UCODE="boot/amd-ucode.img"
_CACHEDIR="/var/cache/pacman/pkg" _CACHEDIR="/var/cache/pacman/pkg"
_CONFIG_DIR="/etc/archboot" _CONFIG_DIR="/etc/archboot"
_DLPROG="curl -L -s" _DLPROG="curl -L -s"
_FIX_PACKAGES="libelf libevent talloc gcc-libs glibc glib2 icu pcre2 nss terminus-font" _FIX_PACKAGES="libelf libevent talloc gcc-libs glibc glib2 icu pcre2 nss terminus-font"
_INTEL_UCODE="/boot/intel-ucode.img" _INTEL_UCODE="boot/intel-ucode.img"
_KERNELPKG="linux" _KERNELPKG="linux"
_KEYRING="archlinux-keyring" _KEYRING="archlinux-keyring"
_LABEL="Exit" _LABEL="Exit"

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

@ -132,7 +132,7 @@ _create_iso() {
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_NSPAWN} "${_W_DIR}" /usr/lib/systemd/ukify build --linux="${_KERNEL}" \ ${_NSPAWN} "${_W_DIR}" /usr/lib/systemd/ukify build --linux="${_KERNEL}" \
${_INTEL_UCODE} ${_AMD_UCODE} --initrd="${initrd}" --cmdline="${_CMDLINE}" \ ${_INTEL_UCODE} ${_AMD_UCODE} --initrd="${initrd}" --cmdline="${_CMDLINE}" \
--os-release=@"${_OSREL}" --splash="${_SPLASH}" --output="${_UKI}" || exit 1 --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 ./