Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2026-01-03 19:23:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

update: Use -j jailpath and _release path as vars

Browse Source
This commit is contained in:
tschettervictor
2025-01-16 07:36:25 -07:00
committed by GitHub
parent 2f7120a176
commit a74f87162a
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
usr/local/share/bastille/update.sh
View File

@@ -123,38 +123,45 @@ jail_check() {
} }
jail_update() { jail_update() {
local _freebsd_update_conf="${bastille_jailsdir}/${TARGET}/root/etc/freebsd-update.conf" local _jailname="${1}"
local _jail_dir="${bastille_jailsdir}/${TARGET}/root" local _jailpath="${bastille_jailsdir}/${TARGET}/root"
local _workdir="${bastille_jailsdir}/${TARGET}/root/var/db/freebsd-update" local _freebsd_update_conf="${_jailpath}/etc/freebsd-update.conf"
local _workdir="${_jailpath}/var/db/freebsd-update"
# Update a thick container # Update a thick container
if [ -d "${bastille_jailsdir}/${TARGET}" ]; then if [ -d "${bastille_jailsdir}/${TARGET}" ]; then
CURRENT_VERSION=$(/usr/sbin/jexec -l "${TARGET}" freebsd-version 2>/dev/null) CURRENT_VERSION=$(/usr/sbin/jexec -l "${TARGET}" freebsd-version 2>/dev/null)
if [ -z "${CURRENT_VERSION}" ]; then if [ -z "${CURRENT_VERSION}" ]; then
error_exit "Can't determine '${TARGET}' version." error_exit "Can't determine '${TARGET}' version."
else else
env PAGER="/bin/cat" freebsd-update ${OPTION} --not-running-from-cron -b "${_jail_dir}" \ env PAGER="/bin/cat" freebsd-update ${OPTION} \
--not-running-from-cron \
-j "${_jailname}" \
-d "${_workdir}" \ -d "${_workdir}" \
-f "${_freebsd_update_conf}" \ -f "${_freebsd_update_conf}" \
fetch install --currently-running "${CURRENT_VERSION}" fetch install
fi fi
fi fi
} }
release_update() { release_update() {
local _freebsd_update_conf="${bastille_releasesdir}/${TARGET}/etc/freebsd-update.conf" local _releasepath="${bastille_releasesdir}/${TARGET}"
local _release_dir="${bastille_releasesdir}/${TARGET}" local _freebsd_update_conf="${_releasepath}/etc/freebsd-update.conf"
# Update a release base(affects child containers) # Update a release base(affects child containers)
if [ -d "${_release_dir}" ]; then if [ -d "${_releasepath}" ]; then
TARGET_TRIM="${TARGET}" TARGET_TRIM="${TARGET}"
if [ -n "${ARCH_I386}" ]; then if [ -n "${ARCH_I386}" ]; then
TARGET_TRIM=$(echo "${TARGET}" | sed 's/-i386//') TARGET_TRIM=$(echo "${TARGET}" | sed 's/-i386//')
fi fi
env PAGER="/bin/cat" freebsd-update ${OPTION} --not-running-from-cron -b "${bastille_releasesdir}/${TARGET}" \ env PAGER="/bin/cat" freebsd-update ${OPTION} \
-d "${bastille_releasesdir}/${TARGET}/var/db/freebsd-update" \ --not-running-from-cron \
-b "${_releasepath}" \
-d "${_releasepath}/var/db/freebsd-update" \
-f "${_freebsd_update_conf}" \ -f "${_freebsd_update_conf}" \
fetch --currently-running "${TARGET_TRIM}" fetch --currently-running "${TARGET_TRIM}"
env PAGER="/bin/cat" freebsd-update ${OPTION} --not-running-from-cron -b "${bastille_releasesdir}/${TARGET}" \ env PAGER="/bin/cat" freebsd-update ${OPTION} \
-d "${bastille_releasesdir}/${TARGET}/var/db/freebsd-update" \ --not-running-from-cron \
-b "${_releasepath}" \
-d "${_releasepath}/var/db/freebsd-update" \
-f "${_freebsd_update_conf}" \ -f "${_freebsd_update_conf}" \
install --currently-running "${TARGET_TRIM}" install --currently-running "${TARGET_TRIM}"
else else
@@ -209,5 +216,5 @@ elif echo "${TARGET}" | grep -q "[0-9]\{2\}.[0-9]-RELEASE"; then
release_update release_update
else else
jail_check jail_check
jail_update jail_update "${TARGET}"
fi fi