diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2022-06-18 07:13:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-18 07:13:52 +0300 |
| commit | 685aaa1a3797ce9237a8bd1c2d27b322f7d2322e (patch) | |
| tree | 801480bc92ff8bc61b3db0c93963967dce83567b | |
| parent | f7609ce70a9daf91cd29c75fd5d273cf2b038b18 (diff) | |
| parent | a684b35bcc0a3b812f6d785571c30e3e303dbba1 (diff) | |
Merge pull request #987 from overhacked/fix_tmpfs_blacklist_wildcards
Fix tmpfs blacklist wildcards
| -rwxr-xr-x | src/share/poudriere/common.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index a9f03baf..c6527b80 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -4757,7 +4757,7 @@ stop_builders() { [ -d "${TMPFS_BLACKLIST_TMPDIR}/wrkdirs" ]; then if ! rm -rf "${TMPFS_BLACKLIST_TMPDIR}/wrkdirs/"*; then chflags -R 0 \ - "${TMPFS_BLACKLIST_TMPDIR}/wkrdirs"/* || : + "${TMPFS_BLACKLIST_TMPDIR}/wrkdirs"/* || : rm -rf "${TMPFS_BLACKLIST_TMPDIR}/wrkdirs"/* || : fi @@ -5191,6 +5191,11 @@ build_pkg() { err 1 "Failed to rollback ${mnt} to prepkg" :> ${mnt}/.need_rollback + # Disabling globs for this loop or wildcards in + # TMPFS_BLACKLIST will expand to files in the + # current directory instead of being passed into + # the case statement as a pattern + set -o noglob for jpkg in ${TMPFS_BLACKLIST-}; do case "${pkgname%-*}" in ${jpkg}) @@ -5205,6 +5210,7 @@ build_pkg() { ;; esac done + set +o noglob rm -rfx ${mnt}/wrkdirs/* || : |