From 2dd5a0ec316410ed3c52b0e05873679d44e33070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Fri, 23 Jun 2023 19:07:03 +0200
Subject: fix

---
 manifests/machine.pp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/manifests/machine.pp b/manifests/machine.pp
index 17cd3a9..e25a5b9 100644
--- a/manifests/machine.pp
+++ b/manifests/machine.pp
@@ -38,14 +38,12 @@ define nspawn::machine (
 ) {
   $root = "${nspawn::machine_dir}/${name}"
 
-  $almost_final_config = $merge ? {
+  $final_config = $merge ? {
     'deep'     => deep_merge($nspawn::config, $config),
     'shallow'  => $nspawn::config + $config,
     'override' => $config,
   }
 
-  $final_config = $nspawn::config_base + $almost_final_config
-
   file { "${nspawn::nspawn_dir}/${name}.nspawn":
     ensure  => $ensure,
     content => epp("${module_name}/systemd/nspawn.epp", {
-- 
cgit v1.2.3