From 37cc1ea1b07de67693a1182e0a0a3db85344bfa2 Mon Sep 17 00:00:00 2001
From: Jose <joserprg@gmail.com>
Date: Thu, 19 Dec 2019 00:58:02 -0400
Subject: [PATCH] Improved jail IP search during import

---
 CHANGELOG     | 1 +
 bastille-init | 2 +-
 version       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 171abcf..a367e77 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.26......Improved jail IP search during import.
 1.0.25......Add foreign jail import support, improved fstab utility.
 1.0.24......Improved Thick container upgrade process.
 1.0.23......Improved container/base update process.
diff --git a/bastille-init b/bastille-init
index 0579eb6..5c90e55 100755
--- a/bastille-init
+++ b/bastille-init
@@ -927,7 +927,7 @@ jail_import()
 		# Get some jail info.
 		NAME_TRIM=$(echo ${TARGET} | awk '{print $1}' | grep -o '[^/]*$' | cut -d '-' -f1)
 		PATH_TRIM=$(echo ${TARGET} | sed "s/${NAME_TRIM}//g")
-		IPV4_ADDR=$(cat ${PATH_TRIM}conf/thebrig.conf | grep -wE "${NAME_TRIM}1|ip4.addr" | tail -n 1 | cut -d '|' -f2 | cut -d '/' -f1)
+		IPV4_ADDR=$(cat ${PATH_TRIM}conf/thebrig.conf | awk "/${NAME_TRIM}/,/ip4.addr/" | tail -n 1 | cut -d '|' -f2 | cut -d '/' -f1)
 		if [ -z "${IPV4_ADDR}" ]; then
 			# The user should manually set a new IP.
 			IPV4_ADDR="0.0.0.0"
diff --git a/version b/version
index 4a4127c..8955a01 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.0.25
+1.0.26