diff --git a/CHANGELOG b/CHANGELOG index e985ce5..86afd06 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,13 +3,14 @@ ====================== Version Description -1.0.9......Allow for distfiles download override. -1.0.8......Add option for thickjail creation if supported. -1.0.7......Added 12.1-RELEASE. -1.0.6......Reload page after base release download. -1.0.5......Add missing uninstall code. -1.0.4......Remove obsolete code, delete shutdown command upon uninstall. -1.0.3......Do not delete base releases with containers child. -1.0.2......Code and regex improvements. -1.0.1......Update paths and minor changes. -1.0.0......First Public Release. +1.0.10......Cosmetic changes and version number adjust. +1.0.09......Allow for distfiles download override. +1.0.08......Add option for thickjail creation if supported. +1.0.07......Added 12.1-RELEASE. +1.0.06......Reload page after base release download. +1.0.05......Add missing uninstall code. +1.0.04......Remove obsolete code, delete shutdown command upon uninstall. +1.0.03......Do not delete base releases with containers child. +1.0.02......Code and regex improvements. +1.0.01......Update paths and minor changes. +1.0.00......First Public Release. diff --git a/gui/bastille_manager-lib.inc b/gui/bastille_manager-lib.inc index e1f7101..8b9c0d0 100755 --- a/gui/bastille_manager-lib.inc +++ b/gui/bastille_manager-lib.inc @@ -56,6 +56,7 @@ $default_distfiles = exec("/bin/cat {$config_path} | /usr/bin/grep 'bastille_boo $jail_dir = "{$rootfolder}/jails"; $image_dir = "ext/bastille/images"; $thick_jail = exec("/usr/local/bin/bastille create | grep -wo '\[option\]'"); +$reldir = "{$rootfolder}/releases"; // Ensure the root directory is configured. if ($rootfolder == "") @@ -69,6 +70,12 @@ else { } if (is_file("{$rootfolder}/postinit")) unlink("{$rootfolder}/postinit"); +// Check releases dir. +function is_dir_empty($reldir) { + if (!is_readable($reldir)) return NULL; + return (count(scandir($reldir)) == 2); +} + // Get all base releases list. function get_all_release_list() { global $rootfolder; @@ -90,7 +97,7 @@ function get_all_release_list() { // Get all interface list. function get_all_interface_list() { global $g; - exec("/bin/echo; /sbin/ifconfig -l | /usr/bin/tr -s ' ' '\n'; /bin/echo 'NONE'",$linkinfo); + exec("/bin/echo; /sbin/ifconfig -l | /usr/bin/tr -s ' ' '\n'; /bin/echo 'Config'",$linkinfo); array_shift($linkinfo); $iflist = []; foreach($linkinfo as $link): diff --git a/gui/bastille_manager_add.php b/gui/bastille_manager_add.php index e18dc97..c5ef637 100644 --- a/gui/bastille_manager_add.php +++ b/gui/bastille_manager_add.php @@ -83,7 +83,7 @@ if($_POST): $jname = $pconfig['jailname']; $ipaddr = $pconfig['ipaddress']; $release = $pconfig['release']; - if ($_POST['interface'] == 'NONE'): + if ($_POST['interface'] == 'Config'): $interface = ""; else: $interface = $pconfig['interface']; diff --git a/gui/bastille_manager_tarballs.php b/gui/bastille_manager_tarballs.php index 0306e2e..1a1c864 100644 --- a/gui/bastille_manager_tarballs.php +++ b/gui/bastille_manager_tarballs.php @@ -204,11 +204,12 @@ $document->render();