diff --git a/README.md b/README.md index d0711469..1f98cdc8 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Available Commands: update Update container base -pX release. upgrade Upgrade container release to X.Y-RELEASE. verify Verify bootstrapped release or automation template. - zfs Manage (get|set) zfs attributes on targeted container(s). + zfs Manage (get|set) ZFS attributes on targeted container(s). Use "bastille -v|--version" for version information. Use "bastille command -h|--help" for more information about a command. @@ -680,7 +680,7 @@ Note: SYSRC requires NO quotes or that quotes (`"`) be escaped. ie; `\"`) Any name provided in the ARG file can be used as a variable in the other hooks. For example, `name=value` in the ARG file will cause instances of `${name}` to be replaced with `value`. The `RENDER` hook can be used to specify existing files or -directories inside the jail whose contents should have the variables replaced. Values can be +directories inside the jail whose contents should have the variables replaced. Values can be specified either through the command line when applying the template or as a default in the ARG file. @@ -936,7 +936,7 @@ validation are not used. bastille zfs ------------ -This sub-command allows managing zfs attributes for the targeted container(s). +This sub-command allows managing ZFS attributes for the targeted container(s). Common usage includes setting container quotas. **set quota** @@ -962,7 +962,7 @@ Note: On UFS systems containers must be stopped before export. ```shell ishmael ~ # bastille export folsom Exporting 'folsom' to a compressed .xz archive. -Sending zfs data stream... +Sending ZFS data stream... 100 % 1057.2 KiB / 9231.5 KiB = 0.115 0:01 Exported '/usr/local/bastille/jails/backups/folsom_2020-01-26-19:23:04.xz' successfully. @@ -977,7 +977,7 @@ ishmael ~ # bastille import folsom_2020-01-26-19:22:23.xz Validating file: folsom_2020-01-26-19:22:23.xz... File validation successful! Importing 'folsom' from compressed .xz archive. -Receiving zfs data stream... +Receiving ZFS data stream... /usr/local/bastille/jails/backups/folsom_2020-01-26-19:22:23.xz (1/1) 100 % 626.4 KiB / 9231.5 KiB = 0.068 0:02 Container 'folsom' imported successfully. diff --git a/docs/chapters/usage.rst b/docs/chapters/usage.rst index e6f4f78a..b4d9ef48 100644 --- a/docs/chapters/usage.rst +++ b/docs/chapters/usage.rst @@ -40,7 +40,7 @@ Usage update Update container base -pX release. upgrade Upgrade container release to X.Y-RELEASE. verify Compare release against a "known good" index. - zfs Manage (get|set) zfs attributes on targeted container(s). + zfs Manage (get|set) ZFS attributes on targeted container(s). Use "bastille -v|--version" for version information. Use "bastille command -h|--help" for more information about a command. diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index 40a7929a..a6759d49 100755 --- a/usr/local/bin/bastille +++ b/usr/local/bin/bastille @@ -111,7 +111,7 @@ Available Commands: update Update container base -pX release. upgrade Upgrade container release to X.Y-RELEASE. verify Compare release against a "known good" index. - zfs Manage (get|set) zfs attributes on targeted container(s). + zfs Manage (get|set) ZFS attributes on targeted container(s). Use "bastille -v|--version" for version information. Use "bastille command -h|--help" for more information about a command. diff --git a/usr/local/share/bastille/export.sh b/usr/local/share/bastille/export.sh index e2773376..398c1632 100644 --- a/usr/local/share/bastille/export.sh +++ b/usr/local/share/bastille/export.sh @@ -91,7 +91,7 @@ jail_export() if [ -n "${bastille_zfs_zpool}" ]; then FILE_EXT="xz" info "Exporting '${TARGET}' to a compressed .${FILE_EXT} archive." - info "Sending zfs data stream..." + info "Sending ZFS data stream..." # Take a recursive temporary snapshot zfs snapshot -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET}@bastille_export_${DATE}" diff --git a/usr/local/share/bastille/import.sh b/usr/local/share/bastille/import.sh index 5ac259f3..75d50268 100644 --- a/usr/local/share/bastille/import.sh +++ b/usr/local/share/bastille/import.sh @@ -79,7 +79,7 @@ validate_archive() { } update_zfsmount() { - # Update the mountpoint property on the received zfs data stream + # Update the mountpoint property on the received ZFS data stream OLD_ZFS_MOUNTPOINT=$(zfs get -H mountpoint "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET_TRIM}/root" | awk '{print $3}') NEW_ZFS_MOUNTPOINT="${bastille_jailsdir}/${TARGET_TRIM}/root" if [ "${NEW_ZFS_MOUNTPOINT}" != "${OLD_ZFS_MOUNTPOINT}" ]; then @@ -343,7 +343,7 @@ jail_import() { elif [ "${FILE_EXT}" = ".zip" ]; then # Attempt to import a foreign/iocage container info "Importing '${TARGET_TRIM}' from foreign compressed ${FILE_EXT} archive." - # Sane bastille zfs options + # Sane bastille ZFS options ZFS_OPTIONS=$(echo ${bastille_zfs_options} | sed 's/-o//g') # Extract required files from the zip archive diff --git a/usr/local/share/bastille/rename.sh b/usr/local/share/bastille/rename.sh index 94fca660..1fb73d2a 100644 --- a/usr/local/share/bastille/rename.sh +++ b/usr/local/share/bastille/rename.sh @@ -92,7 +92,7 @@ change_name() { if [ "${bastille_zfs_enable}" = "YES" ]; then if [ -n "${bastille_zfs_zpool}" ] && [ -n "${bastille_zfs_prefix}" ]; then # Check and rename container ZFS dataset accordingly - # Perform additional checks in case of non-zfs existing containers + # Perform additional checks in case of non-ZFS existing containers if zfs list | grep -qw "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET}"; then if ! zfs rename -f "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NEWNAME}"; then error_exit "Can't rename '${TARGET}' dataset." @@ -115,7 +115,7 @@ change_name() { error_exit "Can't rename '${TARGET}' dataset." fi else - error_exit "Can't determine the zfs origin path of '${TARGET}'." + error_exit "Can't determine the ZFS origin path of '${TARGET}'." fi else # Just rename the jail directory