Make sure bastille-prefix ends with bastille

This commit is contained in:
JRGTH
2025-10-05 02:26:29 -04:00
parent fb036a29da
commit 4b0745ce64
3 changed files with 6 additions and 2 deletions

View File

@@ -3,6 +3,7 @@
======================
Version Description
1.2.14......Make sure bastille-prefix ends with bastille.
1.2.13... ..Fallback for custom bastille prefix name.
1.2.12......Minor code improvements, clean stale pkg files on error.
1.2.11......Add all bastille Linux flavors bootstrap options.

View File

@@ -1346,7 +1346,10 @@ rc_params()
fi
# Check and make sure bastille_zfs_prefix end with "bastille".
if ! echo "${bastille_zfs_prefix}" | grep -qw "${DAFAULT_BASTILLE_PREFIX}"; then
if echo "${DAFAULT_BASTILLE_PREFIX}" | ! grep -iq "${APPNAME}"; then
zfs_support_error
exit 1
elif ! echo "${bastille_zfs_prefix}" | grep -qw "${DAFAULT_BASTILLE_PREFIX}"; then
zfs_support_error
exit 1
fi

View File

@@ -1 +1 @@
1.2.13
1.2.14