From 6c819aac1cf93dc9b88cf093ec757c2cad975b1e Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Fri, 11 Feb 2022 15:02:53 +0100
Subject: [PATCH] prepare new beta

---
 .VERSION                           |  2 +-
 CHANGELOG.md                       | 26 ++++++++++++++------------
 debian/scripts/iobroker_startup.sh |  3 +--
 debian/scripts/maintenance.sh      |  4 ++--
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.VERSION b/.VERSION
index 6421407..936ea37 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v6.1.0-beta.1
\ No newline at end of file
+v6.1.0-beta.2
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce648e5..e515063 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,27 @@
 ## Changelog
 
-### v6.1.0-beta.2 (upcoming)
+### v6.1.0-beta.2 (2022-02-11)
+* fix -kbn option in maintenance script
+* optimize shutdown/ prevent warnings on upgrade
 * remove hostname check for multihost slave
 * optimize startup script logging
-* adding breaks and optimizing maintenance script (fixes [#233](https://github.com/buanet/ioBroker.docker/issues/233))
+* add breaks and optimize maintenance script (fixes [#233](https://github.com/buanet/ioBroker.docker/issues/233))
 * v6.1.0-beta.1 (2021-12-23)
   * some more corrections in maintenance script ([#232 @agross](https://github.com/buanet/ioBroker.docker/pull/232)) 
-  * added autoconfirm parameter to upgrade function in maintenance script ([#229 @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
-  * added alias "m" for maintenance script
+  * add autoconfirm parameter to upgrade function in maintenance script ([#229 @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
+  * add alias "m" for maintenance script
 
 ### v6.0.0 (2021-12-09)
-* moving docu/ restructuring readme
+* move docu/ restructuring readme
 * v6.0.0-beta1 (2021-10-07)
-  * upgrading node version to recommended node14 
-  * adding beta-node16 tag for beta testing node16
-  * updating documentation
+  * upgrade node version to recommended node14 
+  * add beta-node16 tag for beta testing node16
+  * update documentation
 * v5.3.0-beta1 (2021-10-07)
-  * adding check  (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
-  * adding packages for discovery adapter
-  * adding packages for backitup adapter
-  * reorganizing Dockerfile
+  * add check  (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
+  * add packages for discovery adapter
+  * add packages for backitup adapter
+  * reorganize Dockerfile
 
 ### v5.2.0 (2021-09-30)
 * v5.2.0-beta4 (2021-09-10)
diff --git a/debian/scripts/iobroker_startup.sh b/debian/scripts/iobroker_startup.sh
index 9574c5f..f8e7122 100644
--- a/debian/scripts/iobroker_startup.sh
+++ b/debian/scripts/iobroker_startup.sh
@@ -498,8 +498,7 @@ shut_down() {
   echo ' '
   echo "Recived termination signal (SIGTERM)."
   echo "Shutting down ioBroker..."
-  pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
-  kill -SIGTERM "$pid"
+  pkill -SIGTERM -u iobroker -f iobroker.js-controller
   exit
 }
 
diff --git a/debian/scripts/maintenance.sh b/debian/scripts/maintenance.sh
index 10f38c9..8b89fc7 100644
--- a/debian/scripts/maintenance.sh
+++ b/debian/scripts/maintenance.sh
@@ -50,13 +50,13 @@ check_status() {
 switch_on() {
   if [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$killbyname" == "yes" ] # maintenance mode OFF / killbyname = yes  / undocumented, only for use with backitup restore scripts
   then
-    echo 'This command will activate maintenance mode and stop all node processes.'
+    echo 'This command will activate maintenance mode and stop js-controller.'
     echo 'Activating maintenance mode...'
     echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     sleep 1
     echo 'Done.'
     echo 'Stopping ioBroker...'
-    pkill node
+    pkill -u iobroker -f iobroker.js-controller
     sleep 1
     echo 'Done.'
     exit 0