More Combustion changes

Signed-off-by: Dominik Gedon <[email protected]>

backend_modules/libvirt/host/combustion

@@ -1,8 +1,9 @@
 #!/bin/bash
 # combustion: network prepare
-set -euxo pipefail
 
 %{ if image == "leapmicro55o" }
+set -euxo pipefail
+
 function nm_config() {
   connectiondir="/etc/NetworkManager/system-connections"
   connectionfile="$connectiondir/Wired connection $1.nmconnection"
@@ -31,7 +32,7 @@ if [ "$${1-}" = "--prepare" ]; then
 fi
 %{ endif }
 
-# Redirect output to the console
+# Redirect output to log file
 exec > >(exec tee -a /var/log/combustion) 2>&1
 
 %{ if image == "leapmicro55o" }
@@ -58,7 +59,7 @@ ${ gpg_keys }
 # Add repositories
 zypper ar http://${ use_mirror_images ? mirror : "download.opensuse.org" }/repositories/SUSE:/CA/15.5/ ca_suse
 
-%{ if image == "slemicro54-ign" }
+%{ if image == "slemicro54" }
 %{ if testsuite }
 zypper ar http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/SUSE/Products/SLE-Module-Basesystem/15-SP4/x86_64/product os_pool_repo
 %{ endif }
@@ -159,3 +160,6 @@ zypper --non-interactive install $PACKAGES
 
 # Leave a marker
 echo "Configured with combustion" > /etc/issue.d/combustion
+
+# Close outputs and wait for tee to finish.
+exec 1>&- 2>&-; wait;