Merge pull request #850 from gibmat/systemd256-import-credential

systemd v256 seems to require overriding ImportCredential= for all containers
lxc · May 24, 2024 · cc2b72f · cc2b72f
2 parents 2d48ea3 + f6b2e14
commit cc2b72f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator
@@ -92,6 +92,7 @@ fix_systemd_override_unit() {
 		[ "${systemd_version}" -ge 239 ] && echo "NoNewPrivileges=no";
 		[ "${systemd_version}" -ge 249 ] && echo "LoadCredential=";
 		[ "${systemd_version}" -ge 254 ] && echo "PrivateNetwork=no";
+		[ "${systemd_version}" -ge 256 ] && echo "ImportCredential=";
 
 		# Additional settings for privileged containers
 		if is_lxc_privileged_container; then
@@ -102,7 +103,7 @@ fix_systemd_override_unit() {
 			[ "${systemd_version}" -ge 244 ] && echo "ProtectKernelLogs=no";
 			[ "${systemd_version}" -ge 232 ] && echo "ProtectKernelModules=no";
 			[ "${systemd_version}" -ge 231 ] && echo "ReadWritePaths=";
-			[ "${systemd_version}" -ge 254 ] && echo "ImportCredential=";
+			[ "${systemd_version}" -ge 254 ] && [ "${systemd_version}" -lt 256 ] && echo "ImportCredential=";
 		fi
 
 		true;