Mirrors/BastilleBSD_bastille
1
0
Fork 1
mirror of https://github.com/BastilleBSD/bastille.git synced 2025-12-10 17:09:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes discovered during 0.5.20191125 RC

Browse Source
This commit is contained in:
Christer Edwards
2019-11-23 12:56:21 -07:00
parent 5d2954feb9
commit 4c6acc5b17
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@@ -89,8 +89,9 @@ First, create the loopback interface:
```shell ```shell
ishmael ~ # sysrc cloned_interfaces+=lo1 ishmael ~ # sysrc cloned_interfaces+=lo1
ishmael ~ # sysrc ifconfig_lo1_name="bastille0" ishmael ~ # sysrc ifconfig_lo1_name="bastille0"
ishmael ~ # sysrc ifconfig_bastille0_aliases="inet 10.17.89.1/32"
ishmael ~ # ifconfig bastille0 inet 10.17.89.1/32
ishmael ~ # service netif cloneup ishmael ~ # service netif cloneup
ishmael ~ # ifconfig bastille0 inet 10.17.89.10
``` ```
Second, enable the firewall: Second, enable the firewall:
@@ -357,9 +358,9 @@ ishmael ~ # bastille list
folsom 10.17.89.10 folsom /usr/local/bastille/jails/folsom/root folsom 10.17.89.10 folsom /usr/local/bastille/jails/folsom/root
``` ```
You can also list non-running containers with `bastille list jails`. In the You can also list non-running containers with `bastille list containers`. In
same manner you can list archived `logs`, downloaded `templates`, and the same manner you can list archived `logs`, downloaded `templates`, and
`releases. `releases`.
bastille service bastille service

14
usr/local/share/bastille/bootstrap.sh
View File

@@ -315,6 +315,10 @@ bootstrap_release() {
echo -e "${COLOR_RED}Failed validation for ${_archive}.txz, please retry bootstrap!${COLOR_RESET}" echo -e "${COLOR_RED}Failed validation for ${_archive}.txz, please retry bootstrap!${COLOR_RESET}"
rm ${bastille_cachedir}/${RELEASE}/${_archive}.txz rm ${bastille_cachedir}/${RELEASE}/${_archive}.txz
exit 1 exit 1
else
echo -e "${COLOR_GREEN}Validated checksum for ${RELEASE}:${_archive}.txz.${COLOR_RESET}"
echo -e "${COLOR_GREEN}MANIFEST:${SHA256_DIST}${COLOR_RESET}"
echo -e "${COLOR_GREEN}DOWNLOAD:${SHA256_FILE}${COLOR_RESET}"
fi fi
fi fi
@@ -472,8 +476,8 @@ network)
;; ;;
esac esac
if [ ! -z "${2}" ]; then case "${2}" in
if [ "${2}" = 'update' ]; then update)
bastille update "${RELEASE}" bastille update "${RELEASE}"
fi ;;
fi esac

4
usr/local/share/bastille/zfs.sh
View File

@@ -77,13 +77,13 @@ esac
## check ZFS enabled ## check ZFS enabled
if [ ! "${bastille_zfs_enable}" = "YES" ]; then if [ ! "${bastille_zfs_enable}" = "YES" ]; then
echo -e "${COLOR_RED}ZFS not enabled.'${COLOR_RESET}" echo -e "${COLOR_RED}ZFS not enabled.${COLOR_RESET}"
exit 1 exit 1
fi fi
## check zpool defined ## check zpool defined
if [ -z "${bastille_zfs_zpool}" ]; then if [ -z "${bastille_zfs_zpool}" ]; then
echo -e "${COLOR_RED}ZFS zpool not defined.'${COLOR_RESET}" echo -e "${COLOR_RED}ZFS zpool not defined.${COLOR_RESET}"
exit 1 exit 1
fi fi