From 5f6a7a25171fa5859290cf0abde4b7a3bbbec20b Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 5 Apr 2020 20:38:07 +0200
Subject: [PATCH] Fix Odoo setup when tty is attached

---
 apk/spoc                 | 2 +-
 lxc-apps/odoo/install.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apk/spoc b/apk/spoc
index 5929a1e..b3f2a4b 160000
--- a/apk/spoc
+++ b/apk/spoc
@@ -1 +1 @@
-Subproject commit 5929a1ea6b9e551965fde57e4e83b41d05b901c4
+Subproject commit b3f2a4be70309c51a3a119cc32bd01ec1a08d2de
diff --git a/lxc-apps/odoo/install.sh b/lxc-apps/odoo/install.sh
index 24cea75..53a7e52 100755
--- a/lxc-apps/odoo/install.sh
+++ b/lxc-apps/odoo/install.sh
@@ -27,12 +27,11 @@ install -o 108080 -g 108080 -m 750 -d ${ODOO_DATA}
 envsubst <odoo_conf/odoo.conf | install -o 108080 -g 108080 -m 640 /dev/stdin ${ODOO_CONF}/odoo.conf
 
 # Populate database
-spoc-container exec odoo -- /srv/odoo/odoo-bin -c /srv/odoo/odoo.conf -i base --load-language=cs_CZ &
-ODOO_PID=$!
+spoc-container start odoo -- /srv/odoo/odoo-bin -c /srv/odoo/odoo.conf -i base --load-language=cs_CZ
 until grep -q 'odoo.modules.loading: Modules loaded.' /var/log/spoc/odoo.log; do
     sleep 1
 done
-kill ${ODOO_PID}
+spoc-container stop odoo
 
 # Update admin account
 export ODOO_ADMIN_HASH=$(spoc-container exec odoo -- python -c "from passlib.hash import pbkdf2_sha512;print(pbkdf2_sha512.hash('${ODOO_ADMIN_PWD}'))")