Mirrors/xigmanas-bastille-extension
1
0
Fork 1
mirror of https://github.com/JRGTH/xigmanas-bastille-extension.git synced 2025-12-10 17:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable zfs warnings if bastille_zfs_enable = NO

Browse Source 
Disable zfs activation warnings if bastille_zfs_enable is set to NO
This commit is contained in:
JRGTH
2025-10-13 06:14:09 -04:00
parent fcfe6b47b4
commit 9c10025dfd
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -3,6 +3,7 @@
====================== ======================
Version Description Version Description
1.2.16......Disable zfs activation warnings if bastille_zfs_enable is set to NO.
1.2.15......Minor code changes/improvements. 1.2.15......Minor code changes/improvements.
1.2.14......Make sure bastille-prefix ends with bastille. 1.2.14......Make sure bastille-prefix ends with bastille.
1.2.13... ..Fallback for custom bastille prefix name. 1.2.13... ..Fallback for custom bastille prefix name.

4
bastille-init Executable file → Normal file
View File

@@ -1286,7 +1286,7 @@ zfs_support_avail()
zfs_support_disabled() zfs_support_disabled()
{ {
sysrc -f ${CWDIR}${EXTCONF} ZFS_SUPPORT="NO" >/dev/null 2>&1 sysrc -f ${CWDIR}${EXTCONF} ZFS_SUPPORT="NO" >/dev/null 2>&1
sysrc -f ${CWDIR}${EXTCONF} -x ZFS_ACTIVATED >/dev/null 2>&1 sysrc -f ${CWDIR}${EXTCONF} ZFS_ACTIVATED="NO" >/dev/null 2>&1
} }
rc_params() rc_params()
@@ -1389,7 +1389,7 @@ rc_params()
fi fi
else else
# Check for orphaned configuration and/or config reset. # Check for orphaned configuration and/or config reset.
if zfs list -H "${CWDIR}" >/dev/null 2>&1; then if zfs list -H "${CWDIR}" | awk '{print $1}' | grep -qw "${DAFAULT_BASTILLE_PREFIX}"; then
zfs_support_error zfs_support_error
else else
zfs_support_disabled zfs_support_disabled

2
version
View File

@@ -1 +1 @@
1.2.15 1.2.16