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

Allow install in zroot platform with optional zfs dataset

Browse Source 
Allow extension installations in zroot platform with optional zfs user dataset
This commit is contained in:
JRGTH
2025-10-23 15:46:41 -04:00
parent 05e89da69d
commit 3deb377aae
4 changed files with 15 additions and 2 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.20......Allow install in zroot platform with optional zfs dataset.
1.2.19......Fix typo in tarballs page and cleanup, thanks to Lux. 1.2.19......Fix typo in tarballs page and cleanup, thanks to Lux.
1.2.18......Fix typo in tarballs download page, thanks to Lux. 1.2.18......Fix typo in tarballs download page, thanks to Lux.
1.2.17......Check if bastille_zfs_enable is actually set to NO before zfs disable. 1.2.17......Check if bastille_zfs_enable is actually set to NO before zfs disable.

13
bastille-init
View File

@@ -116,6 +116,17 @@ if [ "${bastille_zfs_enable}" = "YES" ] || [ "${bastille_zfs_enable}" = "yes" ];
if echo "${BASTILLE_ZFS_ZPOOL_MOUNTPOINT}" | grep -q '/mnt/'; then if echo "${BASTILLE_ZFS_ZPOOL_MOUNTPOINT}" | grep -q '/mnt/'; then
BASTILLE_ZFS_ZPOOL_MOUNTPOINT_TRIM=$(echo "${BASTILLE_ZFS_ZPOOL_MOUNTPOINT}" | sed "s|/mnt/||;s|/${bastille_zfs_prefix}||") BASTILLE_ZFS_ZPOOL_MOUNTPOINT_TRIM=$(echo "${BASTILLE_ZFS_ZPOOL_MOUNTPOINT}" | sed "s|/mnt/||;s|/${bastille_zfs_prefix}||")
fi fi
# Check if is a zroot install with optional zfs dataset.
if [ -z "${BASTILLE_ZFS_ZPOOL_MOUNTPOINT_TRIM}" ]; then
ZROOT=$(mount | awk -F '/' '/ \/ / {print $1}')
if echo "${BASTILLE_ZFS_ZPOOL_MOUNTPOINT}" | grep -q "/${ZROOT}"; then
BASTILLE_ZFS_ZPOOL_MOUNTPOINT_TRIM="/${ZROOT}"
CWDIR_TRIM=$(echo "${CWDIR}" | sed "s|/mnt/||;s|/${DAFAULT_BASTILLE_PREFIX}||")
if zfs get -H -o value mountpoint "${ZROOT}/${CWDIR_TRIM}"; then
CWDIR_TRIM="/${ZROOT}"
fi
fi
fi
BASTILLE_ZFS_PREFIX_TRIM=$(echo "${bastille_zfs_prefix}" | sed "s|/${DAFAULT_BASTILLE_PREFIX}||") BASTILLE_ZFS_PREFIX_TRIM=$(echo "${bastille_zfs_prefix}" | sed "s|/${DAFAULT_BASTILLE_PREFIX}||")
fi fi
# Check bastille ZFS config match on disk ZFS config. # Check bastille ZFS config match on disk ZFS config.
@@ -1532,7 +1543,6 @@ linux_compat_enable()
# Manually enable Linux compatibility(Experimental). # Manually enable Linux compatibility(Experimental).
if ! sysrc -f ${CWDIR}${EXTCONF} -qc LINUX_COMPAT_SUPPORT=YES; then if ! sysrc -f ${CWDIR}${EXTCONF} -qc LINUX_COMPAT_SUPPORT=YES; then
echo "Enabling Linux compatibility support..." echo "Enabling Linux compatibility support..."
#${CWDIR}/unionfs.sh fetch_pkg && ${CWDIR}/unionfs.sh load_kmods && ${CWDIR}/unionfs.sh unionfs_on && sysrc -f ${CWDIR}${EXTCONF} LINUX_COMPAT_SUPPORT="YES" >/dev/null 2>&1
${CWDIR}/unionfs.sh fetch_debootstrap && ${CWDIR}/unionfs.sh load_kmods && sysrc -f ${CWDIR}${EXTCONF} LINUX_COMPAT_SUPPORT="YES" >/dev/null 2>&1 ${CWDIR}/unionfs.sh fetch_debootstrap && ${CWDIR}/unionfs.sh load_kmods && sysrc -f ${CWDIR}${EXTCONF} LINUX_COMPAT_SUPPORT="YES" >/dev/null 2>&1
else else
echo "Linux compatibility already enabled." echo "Linux compatibility already enabled."
@@ -1569,6 +1579,7 @@ bootstrap_dist()
fi fi
# Enable debootstrap environment. # Enable debootstrap environment.
trap "${CWDIR}/unionfs.sh unionfs_off" 0 1 2 5 15
${CWDIR}/unionfs.sh unionfs_on ${CWDIR}/unionfs.sh unionfs_on
# Bootstrap Linux flavor using bastille. # Bootstrap Linux flavor using bastille.

1
unionfs.sh
View File

@@ -149,6 +149,7 @@ fetch_pkg() {
mkdir -p ${CWDIR}/system/var/db/pkg mkdir -p ${CWDIR}/system/var/db/pkg
fi fi
trap "unionfs_pkgoff" 0 1 2 5 15
unionfs_pkgon unionfs_pkgon
echo "Fetching required packages." echo "Fetching required packages."

2
version
View File

@@ -1 +1 @@
1.2.19 1.2.20