diff --git a/CHANGELOG b/CHANGELOG index 5014ca4..1ee20fc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.1.53......Code changes, handle osrelease parameter update in bastille-init. 1.1.52......Re-add Thin jail release change and code improvements. 1.1.51......Code update/improvements, update jail config/util pages and bastille-init. 1.1.50......Disable linux_compat due incompatibility with later releases. diff --git a/bastille-init b/bastille-init index 65ffe1a..79418be 100644 --- a/bastille-init +++ b/bastille-init @@ -793,6 +793,8 @@ release_change() # If the previous conditions meets, proceed with the container base upgrade. sed -i '' "s/${RELEASE}/${NEWRELEASE}/g" ${bastille_jailsdir}/${TARGET}/fstab echo "${TARGET} release changed to ${NEWRELEASE}." + echo "Setting OS release for ${TARGET}." + bastille config ${TARGET} set osrelease ${NEWRELEASE} elif cat "${bastille_jailsdir}/${TARGET}/fstab" | grep "${NEWRELEASE}" | grep -qw "/.*/.bastille"; then echo "${TARGET} already using ${NEWRELEASE}." exit 0 diff --git a/gui/bastille_manager_util.php b/gui/bastille_manager_util.php index 3c0b7fe..0d77c19 100644 --- a/gui/bastille_manager_util.php +++ b/gui/bastille_manager_util.php @@ -275,7 +275,6 @@ if($_POST): unset($output,$retval);mwexec2($cmd,$output,$retval); if($retval == 0): $savemsg .= sprintf(gtext("Container base release changed to %s successfully."),$new_release); - exec("/usr/local/bin/bastille config {$item} set osrelease $new_release"); exec("echo '{$date}: {$application}: Container base release changed to {$new_release} on {$item} successfully' >> {$logfile}"); //header('Location: bastille_manager_gui.php'); //exit; diff --git a/version b/version index cf6931b..36a0393 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.52 +1.1.53