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

Compare commits

base: Mirrors:fcfe6b47b4bbc1c89aa308927e7fdbec2c31cee4
Branches Tags
Mirrors:master
...
compare: Mirrors:0e3ceeee70c80d2cd6a2339b44a92ee6ab76ddf3
Branches Tags
Mirrors:master

2 Commits
fcfe6b47b4 ... 0e3ceeee70

Author SHA1 Message Date
JRGTH
0e3ceeee70 Check if bastille_zfs_enable is actually set to NO 
Check if bastille_zfs_enable is actually set to NO before zfs disable
 2025-10-13 07:33:21 -04:00
JRGTH
9c10025dfd Disable zfs warnings if bastille_zfs_enable = NO 
Disable zfs activation warnings if bastille_zfs_enable is set to NO
 2025-10-13 06:14:09 -04:00
3 changed files with 8 additions and 4 deletions
Expand all files Collapse all files

2
CHANGELOG
View File

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

8
bastille-init
View File

@@ -1286,7 +1286,7 @@ zfs_support_avail()
zfs_support_disabled()
{
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()
@@ -1389,10 +1389,12 @@ rc_params()
fi
else
# 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
else
zfs_support_disabled
if [ "${bastille_zfs_enable}" = "NO" ] || [ "${bastille_zfs_enable}" = "no" ]; then
zfs_support_disabled
fi
fi
fi

2
version
View File

@@ -1 +1 @@
1.2.15
1.2.17