From 4b0745ce64f92dbd4f77f81ad2e3f231fd5ded06 Mon Sep 17 00:00:00 2001 From: JRGTH Date: Sun, 5 Oct 2025 02:26:29 -0400 Subject: [PATCH] Make sure bastille-prefix ends with bastille --- CHANGELOG | 1 + bastille-init | 5 ++++- version | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8868d3f..cac0a66 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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. diff --git a/bastille-init b/bastille-init index 0fca6a7..f1ac1e2 100755 --- a/bastille-init +++ b/bastille-init @@ -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 diff --git a/version b/version index 0b1f1ed..fd9d1a5 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.13 +1.2.14