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

Merge pull request #1331 from BastilleBSD/tschettervictor-patch-1

Browse Source 
upgrade: use pkgbase if jail is pkgbasified
This commit is contained in:
tschettervictor
2025-12-02 13:26:25 -07:00
committed by GitHub
parent db35e961fb b0f90c2ffc
commit 4f72cdfec2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,7 @@ jail_check() {
else
FREEBSD_BRANCH="release"
fi
if [ "${MAJOR_VERSION}" -ge 16 ] || pkg -r "${bastille_jailsdir}/${TARGET}/root" which /usr/bin/uname > /dev/null 2>&1; then
if pkg -r "${bastille_jailsdir}/${TARGET}/root" which /usr/bin/uname > /dev/null 2>&1; then
PKGBASE=1
fi
fi
@@ -276,7 +276,7 @@ release_check() {
else
FREEBSD_BRANCH="release"
fi
if [ "${MAJOR_VERSION}" -ge 16 ] || pkg -r "${bastille_releasesdir}/${TARGET}" which /usr/bin/uname > /dev/null 2>&1; then
if pkg -r "${bastille_releasesdir}/${TARGET}" which /usr/bin/uname > /dev/null 2>&1; then
PKGBASE=1
fi
fi
@@ -489,4 +489,4 @@ case ${UPDATE_TARGET} in
*)
error_exit "[ERROR]: Unknown update target."
;;
esac
esac

4
usr/local/share/bastille/upgrade.sh
View File

@@ -122,7 +122,7 @@ thick_jail_check() {
else
FREEBSD_BRANCH="release"
fi
if [ "${NEW_MAJOR_VERSION}" -ge 16 ] || pkg -r "${bastille_jailsdir}/${TARGET}/root" which /usr/bin/uname > /dev/null 2>&1; then
if pkg -r "${bastille_jailsdir}/${TARGET}/root" which /usr/bin/uname > /dev/null 2>&1; then
PKGBASE=1
fi
@@ -438,4 +438,4 @@ case ${NEW_RELEASE} in
fi
fi
;;
esac
esac