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

use already local pacman chroot

Browse source
This commit is contained in:
Tobias Powalowski 2024-07-21 10:21:45 +02:00
parent c2a81558b6
commit a22460bade
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,11 @@ _WAYLAND_PACKAGE="egl-wayland"
_STANDARD_PACKAGES="gparted xorg-xhost mtools noto-fonts" _STANDARD_PACKAGES="gparted xorg-xhost mtools noto-fonts"
# chromium is now working on riscv64 # chromium is now working on riscv64
[[ "${_RUNNING_ARCH}" == "riscv64" ]] && _STANDARD_BROWSER="firefox" [[ "${_RUNNING_ARCH}" == "riscv64" ]] && _STANDARD_BROWSER="firefox"
_NSPAWN="systemd-nspawn -q -D" if [[ -d "${_ISO_HOME}" ]]; then
_NSPAWN="systemd-nspawn -q --bind ${_ISO_HOME} -D"
else
_NSPAWN="systemd-nspawn -q -D"
fi
_MAN_INFO_PACKAGES="man-db man-pages texinfo" _MAN_INFO_PACKAGES="man-db man-pages texinfo"
### check for root ### check for root

3
usr/lib/archboot/server.sh
View file

@ -107,7 +107,8 @@ _update_source() {
_server_release() { _server_release() {
cd "${_ISO_HOME_ARCH}" || exit 1 cd "${_ISO_HOME_ARCH}" || exit 1
"archboot-${_ARCH}-release.sh" "${_ISO_BUILD_DIR}" "file:///${_ISO_HOME_SOURCE}/${_DIR}" || exit 1 # needed else package cache is not reachable on binfmt containers
"archboot-${_ARCH}-release.sh" "${_ISO_BUILD_DIR}" "file://${_ISO_HOME_SOURCE}/${_DIR}" || exit 1
# set user rights on files # set user rights on files
[[ -d "${_ISO_BUILD_DIR}" ]] || exit 1 [[ -d "${_ISO_BUILD_DIR}" ]] || exit 1
chmod 755 "${_ISO_BUILD_DIR}" chmod 755 "${_ISO_BUILD_DIR}"