From a0c21ec319867c1f1625aeb589fb5bec47e955a4 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 16 Apr 2018 23:41:13 +0200
Subject: [PATCH] Fix login CLI

---
 buildroot-external/board/ova/post-build.sh            |  1 +
 .../systemd/system/getty@tty1.service.d/mingetty.conf |  2 +-
 buildroot-external/rootfs-overlay/usr/bin/hassio-cli  | 11 ++++++-----
 buildroot-external/scripts/rootfs_layer.sh            |  6 ++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/buildroot-external/board/ova/post-build.sh b/buildroot-external/board/ova/post-build.sh
index 529e3d9ac..f2f5e4417 100755
--- a/buildroot-external/board/ova/post-build.sh
+++ b/buildroot-external/board/ova/post-build.sh
@@ -8,5 +8,6 @@ BOARD_DIR="$(dirname $0)"
 
 # HassioOS tasks
 fix_rootfs
+install_hassio_cli
 
 cp ${BOARD_DIR}/rauc.conf ${TARGET_DIR}/etc/rauc/system.conf
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf
index a4011e1c6..b76ef2e1e 100644
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf
@@ -1,3 +1,3 @@
 [Service]
 ExecStart=
-ExecStart=-/sbin/mingetty --noclear %I
+ExecStart=/sbin/mingetty --noclear %I
diff --git a/buildroot-external/rootfs-overlay/usr/bin/hassio-cli b/buildroot-external/rootfs-overlay/usr/bin/hassio-cli
index b471077e3..128ef571c 100755
--- a/buildroot-external/rootfs-overlay/usr/bin/hassio-cli
+++ b/buildroot-external/rootfs-overlay/usr/bin/hassio-cli
@@ -3,19 +3,20 @@
 # Load configs
 CONFIG_FILE=/mnt/data/hassio.json
 
-CLI="$(jq --raw-output '.cli' $CONFIG_FILE)"
-DOCKER_ARGS="$(jq --raw-output '.cli_args // empty' $CONFIG_FILE)"
+CLI="$(jq --raw-output '.cli' ${CONFIG_FILE})"
+DOCKER_ARGS="$(jq --raw-output '.cli_args // empty' ${CONFIG_FILE})"
 CLI_DATA=/mnt/data/cli
 
 ##
 # Main program
 run_cli() {
     # Run CLI
+    docker rm --force cli || true
     docker run --name cli \
         --rm -ti --init \
-        -v $CLI_DATA:/data \
+        -v ${CLI_DATA}:/data \
         $DOCKER_ARGS \
-        $CLI
+        ${CLI}
 
     # Jump to root shell
     if [ $? -eq 10 ]; then
@@ -25,7 +26,7 @@ run_cli() {
 
 ##
 # Run endless CLI
-mkdir -p $CLI_DATA
+mkdir -p ${CLI_DATA}
 
 while true; do
     run_cli
diff --git a/buildroot-external/scripts/rootfs_layer.sh b/buildroot-external/scripts/rootfs_layer.sh
index aeb1d03a0..f8bcffccc 100644
--- a/buildroot-external/scripts/rootfs_layer.sh
+++ b/buildroot-external/scripts/rootfs_layer.sh
@@ -6,3 +6,9 @@ function fix_rootfs() {
     rm -rf ${TARGET_DIR}/etc/systemd/system/multi-user.target.wants/dhcpcd.service
     rm -rf ${TARGET_DIR}/usr/lib/systemd/system/dhcpcd.service
 }
+
+
+function install_hassio_cli() {
+
+    sed -i "s|\(root.*\)/bin/sh|\1/usr/bin/hassio-cli|" ${TARGET_DIR}/etc/passwd
+}