add network-sandbox support/document it

Signed-off-by: Paul Healy <lmiphay@gmail.com>

3 files changed, 34 insertions, 13 deletions

diff --git a/app-misc/homeassistant-bin/Manifest b/app-misc/homeassistant-bin/Manifest
index 38f782c..a5aaaa7 100644
--- a/app-misc/homeassistant-bin/Manifest
+++ b/app-misc/homeassistant-bin/Manifest
@@ -3,8 +3,8 @@ AUX homeassistant.init.d 893 BLAKE2B 31919b99df6ed1789597bafade1cd612609a065bbdd
 AUX homeassistant.logrotate 280 BLAKE2B a1e5ecf35df38b4928415af19c72bb3012fa8ea8f39d71c63c4efbc91df76aa644ecea6d66a6cefac80ef03678f6fbf918b7f9efd5651128c4961e578a822f58 SHA512 9aa3305c605ae2deccac9b69d43cdf50c9dd67bc0abfe5a576cbd866bdc3ba92bdcc824b3e5990d903bad3685abdfec66b4a8bae122a7ea79dabb5f6e8b08613
 AUX homeassistant.service 261 BLAKE2B 54819aa30aa5564aca693fa2dd70ad4a9831929a33f1042542e2555fa1ec2cb5cefd746b6abc308bc970f627803279dc3caf5fbf3de5c94b3fd73760e1343a38 SHA512 83f6ba1782f844c290f349ff50bdea8d8d88d41e2f39f3f7d5a015a0f463a4c8f7328acbd3838380cf6ca78090b39ebdbeb5e3f39607b5e307c0e53ff55ee697
 AUX recorder.yaml 114 BLAKE2B af04840805aa13124208584e7f1d40335905a083ee7deead5c0e4324c969f2a231c801c23e42075782950aba7535496d92747bf03efd73a80b0d07e8492d18f6 SHA512 cb4e353e54fb6dc7034569b8d62ddcdca92680c23c2c4e1ce707d21cf95e93f41a0c44521d8c3ee90b68c830f6b8e65dab82ae64bfa09727ae384550f7de0c94
-AUX update-homeassistant 1456 BLAKE2B 202466661d959fcae9b425c37b8f18ed5653f6c53331508e7d39abc9605aaee220137771fc816d0ead145eac2ac0ffcd22d24991d2531c5792a720ab73ed40f8 SHA512 b50a685e0f4ef75dbba87cbabd5bd6ae6ed9732068e9ad870210d21d0896e0ffef3c59de862571f03c1162b240732385fef99d15a6a0d9a517a70efd98c337ad
+AUX update-homeassistant 1672 BLAKE2B b8a99eb0f13847e28acc5f52a2313973d791e5993f76490e534f73f188fd44895dfac5d751226bc769787d466a0d8bbdb3ec369dc8a0cedd7144fce779cd9de0 SHA512 26e0cfc66f2d48218db7fe6b3e9c0b92d765f6eb6c91bc39aedb56c6d6f419ce263c8d47637936622c8afcdf0cb7c1864e249cd190a110ea996cb4eff5122a81
 EBUILD homeassistant-bin-0.89.1.ebuild 3561 BLAKE2B 4495ab1ce8f8f45b9a497fb58f9282c6f0d1ed6f74bd941d0ca10fca8c3b0fb88b3ad599de09359746ce06f2944695226873a77b28bd88612aa350dbee147c50 SHA512 6a21fda18fed1efd506f20a176ba81c490fad20dd9ed63165a960e3d55892d6fc6e061a1d92c1ab5f96135a7e2addd672173c7b970e469dd7b6e6222f7d2f540
 EBUILD homeassistant-bin-0.89.2.ebuild 3561 BLAKE2B 4495ab1ce8f8f45b9a497fb58f9282c6f0d1ed6f74bd941d0ca10fca8c3b0fb88b3ad599de09359746ce06f2944695226873a77b28bd88612aa350dbee147c50 SHA512 6a21fda18fed1efd506f20a176ba81c490fad20dd9ed63165a960e3d55892d6fc6e061a1d92c1ab5f96135a7e2addd672173c7b970e469dd7b6e6222f7d2f540
-EBUILD homeassistant-bin-0.90.0.ebuild 3561 BLAKE2B 4495ab1ce8f8f45b9a497fb58f9282c6f0d1ed6f74bd941d0ca10fca8c3b0fb88b3ad599de09359746ce06f2944695226873a77b28bd88612aa350dbee147c50 SHA512 6a21fda18fed1efd506f20a176ba81c490fad20dd9ed63165a960e3d55892d6fc6e061a1d92c1ab5f96135a7e2addd672173c7b970e469dd7b6e6222f7d2f540
+EBUILD homeassistant-bin-0.90.0.ebuild 3984 BLAKE2B c6da750ba07677ef30f461946b945be87f9374806aef9c628e163947b698600fa64ea4db6783d9ca40864891432ef30651f1f8d2c5b3484d057dff52db58e63b SHA512 ae558d27f42d475237b9ce108c02e917197aebf0be5321722b70197015af8f22c2dad2ca9eeab7383c6af8ac87112568852b67f21688f65489f72de62f6bd067
 EBUILD homeassistant-bin-9999.ebuild 2566 BLAKE2B 8bc81f53fb3cb8744ac59aa48c14e01d442a48fde8ed408b72922f6c921f81b6cacf4ce759a256f720c14416eaf3a62d92bf1f26c1f28919b90743d088908df2 SHA512 cd28376bdc8f7cc988a1ed01e84a03ac4de8bf843a1169ca87ab4e1d9c116a30abec36dc049e34058455e27c7ae96ae6587ac4b13a122565bae7cc718ed990c4
diff --git a/app-misc/homeassistant-bin/files/update-homeassistant b/app-misc/homeassistant-bin/files/update-homeassistant
index 4e48c62..428e94e 100755
--- a/app-misc/homeassistant-bin/files/update-homeassistant
+++ b/app-misc/homeassistant-bin/files/update-homeassistant
@@ -9,13 +9,15 @@
 prog="homeassistant"
 atom="app-misc/${prog}-bin"
 
-if /etc/init.d/${prog} --ifstarted stop ; then
-    echo "${prog} stopped"
-else
-    echo "failed to stop, sleeping/killing: ${prog}"
-    sleep 10
-    pkill -9 -f "/opt/${prog}/bin/python3"
-    /etc/init.d/${prog} zap
+if [ -f /etc/init.d/${prog} ] ; then
+    if /etc/init.d/${prog} --ifstarted stop ; then
+	echo "${prog} stopped"
+    else
+	echo "failed to stop, sleeping/killing: ${prog}"
+	sleep 20
+	pkill -9 -f "/opt/${prog}/bin/python3"
+	/etc/init.d/${prog} zap
+    fi
 fi
 
 installed_version()
@@ -23,28 +25,38 @@ installed_version()
     equery --no-color list -F '$fullversion' "${atom}" | tail -1
 }
 
+rollback_info()
+{
+    if [ -d "/opt/${prog}-v${version}" ] ; then
+	echo "rollback by: mv /opt/${prog}-v${version} /opt/${prog}"
+    fi
+}
+
 version=$(installed_version)
 
 if [ -d "/opt/${prog}" ] ; then
     if [ ! -d "/opt/${prog}-v${version}" ] ; then
 	echo "backing up previous version as v${version}"
-	echo "rollback by: mv /opt/${prog}-v${version} /opt/${prog}"
 	mv "/opt/${prog}" "/opt/${prog}-v${version}"
+	rollback_info
     else
 	echo "Previous backup found - (re-)move it manually and run the script again"
 	exit 2
     fi
 fi
 
-if emerge -v1 "${atom}" ; then
+echo "The portage network-sandbox will be temporally disabled to install ${atom}"
+read -t 5 -p "Hit Control-C within 5 seconds to abort this install..."
+
+if FEATURES="-network-sandbox" emerge -v1 "${atom}" ; then
     echo "${atom} $(installed_version) merge successful"
     /etc/init.d/${prog} --ifstopped start
     echo "now check the logs in /var/log/${prog}; e.g."
     echo "  tail -f /var/log/${prog}/server.log"
-    echo "rollback by: mv /opt/${prog}-v${version} /opt/${prog}"
+    rollback_info
     exit 0
 else
     echo "${atom} merge failed"
-    echo "rollback by: mv /opt/${prog}-v${version} /opt/${prog}"
+    rollback_info
     exit 1
 fi
diff --git a/app-misc/homeassistant-bin/homeassistant-bin-0.90.0.ebuild b/app-misc/homeassistant-bin/homeassistant-bin-0.90.0.ebuild
index cecd39b..16eb820 100644
--- a/app-misc/homeassistant-bin/homeassistant-bin-0.90.0.ebuild
+++ b/app-misc/homeassistant-bin/homeassistant-bin-0.90.0.ebuild
@@ -68,6 +68,15 @@ S="${WORKDIR}"
 pkg_setup() {
 	enewgroup "${MY_PN}"
 	enewuser "${MY_PN}" -1 -1 "$INSTALL_DIR" "${MY_PN}"
+
+	elog "This ebuild requires network access for 'pip install $MY_PN'"
+	elog "If the install fails due to name lookup retrying out, then try"
+	elog "disabling the portage network-sandbox ; e.g. in /etc/portage/make.conf:"
+	elog ""
+	elog "FEATURES=\"-network-sandbox\""
+	elog ""
+	elog "The update-homeassistant script temporally disables the network-sandbox (and can"
+	elog "also be used to do an initial install of ${PN})."
 }
 
 src_compile() {