diff --git a/CHANGELOG b/CHANGELOG index f70d575..1478bf8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.0.88......Fix for properly copy host resolv.conf to jails. 1.0.87......Cosmetic changes, update help output. 1.0.86......Implement release native upgrade, re-add makewhatis since is needed by freebsd-update. 1.0.85......Add missing system file to properly compare and merge files upon upgrades. diff --git a/gui/bastille_manager_add.php b/gui/bastille_manager_add.php index 9813f26..8b66252 100644 --- a/gui/bastille_manager_add.php +++ b/gui/bastille_manager_add.php @@ -58,6 +58,7 @@ if(!get_all_release_list()): endif; if($_POST): + global $jail_dir; global $configfile; unset($input_errors); $pconfig = $_POST; @@ -69,6 +70,8 @@ if($_POST): $jname = $pconfig['jailname']; $ipaddr = $pconfig['ipaddress']; $release = $pconfig['release']; + $resolv_conf = "{$jail_dir}/{$jname}/root/etc/resolv.conf"; + $resolv_host = "/var/etc/resolv.conf"; $options = ""; if ($_POST['interface'] == 'Config'): $interface = ""; @@ -102,6 +105,11 @@ if($_POST): if ($_POST['autostart']): exec("/usr/sbin/sysrc -f {$configfile} {$jname}_AUTO_START=\"YES\""); endif; + if(is_link($resolv_conf)): + if(unlink($resolv_conf)): + exec("/usr/local/bin/bastille cp $jname $resolv_host etc"); + endif; + endif; //$savemsg .= gtext("Boot Environment created and activated successfully."); header('Location: bastille_manager_gui.php'); exit; diff --git a/version b/version index 9435145..5ca0603 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.87 +1.0.88