From bb3d3a95aff6e8f4f34a6cee98e914bdf6e4ec40 Mon Sep 17 00:00:00 2001 From: tschettervictor <85497460+tschettervictor@users.noreply.github.com> Date: Thu, 15 May 2025 08:24:18 -0600 Subject: [PATCH] upgrade: Use config sub command to update osrelease --- usr/local/share/bastille/upgrade.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/local/share/bastille/upgrade.sh b/usr/local/share/bastille/upgrade.sh index 165e936d..915f804d 100644 --- a/usr/local/share/bastille/upgrade.sh +++ b/usr/local/share/bastille/upgrade.sh @@ -170,8 +170,8 @@ jail_upgrade() { local _newrelease="${NEWRELEASE}" # Update "osrelease" entry inside fstab sed -i '' "/.bastille/ s|${_oldrelease}|${_newrelease}|g" "${bastille_jailsdir}/${_jailname}/fstab" - # Update "osrelease" inside jail.conf - sed -i '' "/osrelease/ s|${_oldrelease}|${_newrelease}|g" "${bastille_jailsdir}/${_jailname}/jail.conf" + # Update "osrelease" inside jail.conf using 'bastille config' + bastille config ${_jailname} set osrelease ${_newrelease} # Start jail if AUTO=1 if [ "${AUTO}" -eq 1 ]; then bastille start "${_jailname}" @@ -187,8 +187,8 @@ jail_upgrade() { -f "${_freebsd_update_conf}" \ -r "${_newrelease}" upgrade - # Update "osrelease" entry inside jail.conf - sed -i '' "/osrelease/ s|${_oldrelease}|${_newrelease}|g" "${bastille_jailsdir}/${_jailname}/jail.conf" + # Update "osrelease" inside jail.conf using 'bastille config' + bastille config ${_jailname} set osrelease ${_newrelease} warn "Please run 'bastille upgrade ${_jailname} install', restart the jail, then run 'bastille upgrade ${_jailname} install' again to finish installing updates." fi }