BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Error handling, don't delete legacy directory unless really empty

Browse Source
This commit is contained in:
Jose
2020-05-10 10:09:17 -04:00
parent d47e2a7cfb
commit 33588397ad
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
usr/local/share/bastille/rename.sh
View File

@@ -103,6 +103,9 @@ change_name() {
if [ -n "${bastille_zfs_zpool}" ]; then if [ -n "${bastille_zfs_zpool}" ]; then
# Rename ZFS dataset and mount points accordingly # Rename ZFS dataset and mount points accordingly
zfs rename "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NEWNAME}" zfs rename "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NEWNAME}"
if [ "$?" -ne 0 ]; then
error_notify "${COLOR_RED}Error: Can't rename zfs dataset.${COLOR_RESET}"
fi
fi fi
else else
# Try to get the zfs origin path before rename dataset # Try to get the zfs origin path before rename dataset
@@ -111,6 +114,9 @@ change_name() {
ZFS_DATASET_TARGET=$(echo "${ZFS_DATASET_ORIGIN}" | sed "s|\/${TARGET}||") ZFS_DATASET_TARGET=$(echo "${ZFS_DATASET_ORIGIN}" | sed "s|\/${TARGET}||")
if [ -n "${ZFS_DATASET_ORIGIN}" ]; then if [ -n "${ZFS_DATASET_ORIGIN}" ]; then
zfs rename "${ZFS_DATASET_ORIGIN}" "${ZFS_DATASET_TARGET}/${NEWNAME}" zfs rename "${ZFS_DATASET_ORIGIN}" "${ZFS_DATASET_TARGET}/${NEWNAME}"
if [ "$?" -ne 0 ]; then
error_notify "${COLOR_RED}Error: Can't rename zfs dataset.${COLOR_RESET}"
fi
else else
error_notify "${COLOR_RED}Can't determine the zfs origin path of '${TARGET}'.${COLOR_RESET}" error_notify "${COLOR_RED}Can't determine the zfs origin path of '${TARGET}'.${COLOR_RESET}"
fi fi
@@ -127,9 +133,11 @@ change_name() {
update_jailconf update_jailconf
update_fstab update_fstab
# Remove the old jail directory if exist # Remove the old jail directory if exist and is empty
if [ -d "${bastille_jailsdir}/${TARGET}" ]; then if [ -d "${bastille_jailsdir}/${TARGET}" ]; then
rm -r "${bastille_jailsdir}/${TARGET}" if [ ! "$(ls -A ${bastille_jailsdir}/${TARGET})" ]; then
rm -r "${bastille_jailsdir}/${TARGET}"
fi
fi fi
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
error_notify "${COLOR_RED}An error has occurred while attempting to rename '${TARGET}'.${COLOR_RESET}" error_notify "${COLOR_RED}An error has occurred while attempting to rename '${TARGET}'.${COLOR_RESET}"