mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
add exit 1 on same points as on aarch64
This commit is contained in:
parent
70a7c7817e
commit
2dc03fb238
3 changed files with 2 additions and 3 deletions
|
@ -6,7 +6,6 @@ _X86_64="$(mktemp -d X86_64.XXX)"
|
||||||
_SHIM_URL="https://kojipkgs.fedoraproject.org/packages/shim/15.4/5/x86_64"
|
_SHIM_URL="https://kojipkgs.fedoraproject.org/packages/shim/15.4/5/x86_64"
|
||||||
_SHIM_VERSION="shim-x64-15.4-5.x86_64.rpm"
|
_SHIM_VERSION="shim-x64-15.4-5.x86_64.rpm"
|
||||||
_SHIM32_VERSION="shim-ia32-15.4-5.x86_64.rpm"
|
_SHIM32_VERSION="shim-ia32-15.4-5.x86_64.rpm"
|
||||||
_LOG=""
|
|
||||||
|
|
||||||
usage () {
|
usage () {
|
||||||
echo "${_BASENAME}: usage"
|
echo "${_BASENAME}: usage"
|
||||||
|
|
|
@ -25,7 +25,7 @@ echo "Start release creation in $1 ..."
|
||||||
mkdir -p $1
|
mkdir -p $1
|
||||||
cd $1
|
cd $1
|
||||||
# create container
|
# create container
|
||||||
archboot-x86_64-create-container.sh "${_W_DIR}" -cc -cp -alf
|
archboot-x86_64-create-container.sh "${_W_DIR}" -cc -cp -alf || exit 1
|
||||||
# generate tarball in container, umount tmp it's a tmpfs and weird things could happen then
|
# generate tarball in container, umount tmp it's a tmpfs and weird things could happen then
|
||||||
echo "Generate ISO ..."
|
echo "Generate ISO ..."
|
||||||
systemd-nspawn -q -D "${_W_DIR}" /bin/bash -c "umount /tmp;archboot-x86_64-iso.sh -t -i=archrelease"
|
systemd-nspawn -q -D "${_W_DIR}" /bin/bash -c "umount /tmp;archboot-x86_64-iso.sh -t -i=archrelease"
|
||||||
|
|
|
@ -32,7 +32,7 @@ cp "${_PACMAN_MIRROR}".archboot "${_PACMAN_MIRROR}"
|
||||||
# create release in "${_BUILDDIR}"
|
# create release in "${_BUILDDIR}"
|
||||||
cd "${_BUILDDIR}"
|
cd "${_BUILDDIR}"
|
||||||
[[ -e "${_DIRECTORY}" ]] && rm -r "${_DIRECTORY}"
|
[[ -e "${_DIRECTORY}" ]] && rm -r "${_DIRECTORY}"
|
||||||
archboot-"${_ARCH}"-release.sh "${_DIRECTORY}"
|
archboot-"${_ARCH}"-release.sh "${_DIRECTORY}" || exit 1
|
||||||
# set user rights on files
|
# set user rights on files
|
||||||
chown -R "${_USER}" "${_DIRECTORY}"
|
chown -R "${_USER}" "${_DIRECTORY}"
|
||||||
chgrp -R "${_GROUP}" "${_DIRECTORY}"
|
chgrp -R "${_GROUP}" "${_DIRECTORY}"
|
||||||
|
|
Loading…
Reference in a new issue