OTA-3988: Split the local.conf to a base and a distro specific partfeat/OTA-3988/non-systemd-support

Signed-off-by: Mykhaylo Sul <ext-mykhaylo.sul@here.com>

2 files changed, 1 insertions, 22 deletions

diff --git a/conf/local.nonsystemd.conf.sample.append b/conf/local.conf.base.append
index 6aeb61c..36b2f59 100644
--- a/conf/local.nonsystemd.conf.sample.append
+++ b/conf/local.conf.base.append
@@ -1,11 +1,10 @@
-
 #
 # meta-updater configuration, see README.adoc and aktualizr's
 # documentation for more options and detailed documentation
 #
 
 MACHINE = "##MACHINE##"
-DISTRO = "poky-sota"
+DISTRO = "##DISTRO##"
 
 # General SOTA setup
 #SOTA_CLIENT_PROV = "aktualizr-shared-prov"
diff --git a/conf/local.conf.sample.append b/conf/local.conf.systemd.append
index fc565f8..12e0182 100644
--- a/conf/local.conf.sample.append
+++ b/conf/local.conf.systemd.append
@@ -1,23 +1,3 @@
-
-#
-# meta-updater configuration, see README.adoc and aktualizr's
-# documentation for more options and detailed documentation
-#
-
-MACHINE = "##MACHINE##"
-DISTRO = "poky-sota-systemd"
-
-# General SOTA setup
-#SOTA_CLIENT_PROV = "aktualizr-shared-prov"
-#SOTA_PACKED_CREDENTIALS = "/path/to/credentials.zip"
-
-# Uncomment this line to start an ssh server at boot automatically
-#IMAGE_FEATURES += "ssh-server-dropbear"
-
-# Uncomment this line to set the log level of aktualizr to 'debug' (from 'info'
-# by default)
-#IMAGE_INSTALL_append += " aktualizr-log-debug"
-
 # Store systemd logs in persistent storage
 #
 # It greatly helps diagnosing issues on testing devices but should be