From 0c708358e68755a487db238994fbe32ba1314d92 Mon Sep 17 00:00:00 2001 From: JRGTH Date: Tue, 21 Dec 2021 21:10:18 -0400 Subject: [PATCH] Fix a bug to display correct VNET interface --- CHANGELOG | 1 + gui/bastille_manager-lib.inc | 2 +- version | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c54e91d..11e11f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.1.05......Fix a bug to display correct VNET interface. 1.1.04......Fix a bug that prevents VNET jail creation. 1.1.03......Add patch to improve ZFS activation, contributed by disaster. 1.1.02......Create required dir for templates link creation. diff --git a/gui/bastille_manager-lib.inc b/gui/bastille_manager-lib.inc index 51f0b2d..2abe1dc 100755 --- a/gui/bastille_manager-lib.inc +++ b/gui/bastille_manager-lib.inc @@ -238,7 +238,7 @@ function get_jail_infos() { $r['rel'] = "-"; endif; // Display interfaces. - $r['nic'] = exec("/usr/bin/grep -w 'interface' {$jail_dir}/{$item}/jail.conf | /usr/bin/awk '{print $3}' | /usr/bin/tr -d ';'"); + $r['nic'] = exec("/usr/bin/grep -wE 'interface.*=.*;|vnet.interface.*=.*;' {$jail_dir}/{$item}/jail.conf | /usr/bin/awk '{print $3}' | /usr/bin/tr -d ';'"); if (!$r['nic']): $r['nic'] = "-"; endif; diff --git a/version b/version index e24c354..0ce14c1 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.04 +1.1.05