3 files changed, 11 insertions, 25 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
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 4754e1d..19a5c94 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -4,10 +4,11 @@ SCRIPT="envsetup.sh"
 MACHINE="$1"
 BUILDDIR="build"
 DISTRO="poky-sota-systemd"
-declare -A supported_distros=( ["poky-sota-systemd"]="local.conf.sample.append" ["poky-sota"]="local.nonsystemd.conf.sample.append" )
+BASE_CONF="local.conf.base.append"
+declare -A supported_distros=( ["poky-sota-systemd"]="local.conf.systemd.append" ["poky-sota"]="local.conf.base.append" )
 
 [[ "$#" -lt 1 ]] && { echo "Usage: ${SCRIPT} <machine> [builddir] [distro=< poky-sota-systemd | poky-sota >]"; return 1; }
-[[ "$#" -eq 2 ]] && { BUILDDIR="$2"; }
+[[ "$#" -ge 2 ]] && { BUILDDIR="$2"; }
 [[ "$#" -eq 3 ]] && { DISTRO="$3"; }
 
 # detect if this script is sourced: see http://stackoverflow.com/a/38128348/6255594
@@ -35,7 +36,13 @@ if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
   cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf
   cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf
 
-  sed "s/##MACHINE##/$MACHINE/g" "${METADIR}/meta-updater/conf/$DISTRO_CONF" >> conf/local.conf
+  sed -e "s/##MACHINE##/$MACHINE/g" \
+      -e "s/##DISTRO##/$DISTRO/g" \
+         "${METADIR}/meta-updater/conf/$BASE_CONF" >> conf/local.conf
+
+  if [ "$BASE_CONF" != "$DISTRO_CONF" ]; then
+    cat "${METADIR}/meta-updater/conf/$DISTRO_CONF" >> conf/local.conf
+  fi
 else
   source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
 fi