From 4b71d2246718b6a1a0b37145e2a4671985dcb973 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Tue, 1 Feb 2022 14:46:58 +0100
Subject: [PATCH] Fix Netdata stack install

---
 wo/cli/plugins/stack.py      | 14 ++++----------
 wo/cli/plugins/stack_pref.py |  3 ++-
 wo/core/aptget.py            |  3 ++-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index a792a38..28a69b0 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -429,16 +429,10 @@ class WOStackController(CementBaseController):
                         os.path.isdir("/etc/netdata")):
                     Log.debug(
                         self, "Setting packages variable for Netdata")
-                    if WOVar.wo_distro == 'raspbian':
-                        packages = packages + [['https://my-netdata.io/'
-                                                'kickstart.sh',
-                                                '/var/lib/wo/tmp/kickstart.sh',
-                                                'Netdata']]
-                    else:
-                        packages = packages + [['https://my-netdata.io/'
-                                                'kickstart-static64.sh',
-                                                '/var/lib/wo/tmp/kickstart.sh',
-                                                'Netdata']]
+                    packages = packages + [['https://my-netdata.io/'
+                                            'kickstart.sh',
+                                            '/var/lib/wo/tmp/kickstart.sh',
+                                            'Netdata']]
                 else:
                     Log.debug(self, "Netdata already installed")
                     Log.info(self, "Netdata already installed")
diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py
index ff2b143..3d13abb 100644
--- a/wo/cli/plugins/stack_pref.py
+++ b/wo/cli/plugins/stack_pref.py
@@ -1747,7 +1747,8 @@ def post_pref(self, apt_packages, packages, upgrade=False):
             Log.wait(self, "Installing Netdata")
             WOShellExec.cmd_exec(
                 self, "bash /var/lib/wo/tmp/kickstart.sh "
-                "--dont-wait --no-updates", errormsg='', log=False)
+                "--dont-wait --no-updates --static-only",
+                errormsg='', log=False)
             Log.valide(self, "Installing Netdata")
             if os.path.isdir('/etc/netdata'):
                 wo_netdata = "/"
diff --git a/wo/core/aptget.py b/wo/core/aptget.py
index 2fc6277..28f583d 100644
--- a/wo/core/aptget.py
+++ b/wo/core/aptget.py
@@ -99,7 +99,8 @@ class WOAptGet():
                     "--option=Dpkg::options::=--force-confdef "
                     "--option=Dpkg::options::=--force-unsafe-io "
                     "--option=Dpkg::options::=--force-confold "
-                    "--assume-yes --quiet dist-upgrade",
+                    "--assume-yes --quiet --allow-downgrades "
+                    "dist-upgrade",
                     shell=True, stdin=None,
                     stdout=f, stderr=f,
                     executable="/bin/bash")