From c6dd597cf71b71fc1de75e3e8ce17bd202f877cb Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Thu, 25 Aug 2022 12:34:06 -0400
Subject: [PATCH] debian: Disable additional systemd services

Disable the following services:

- systemd-timesyncd
- systemd-networkd
- systemd-network-generator
- systemd-resolved
- systemd-homed
- systemd-userdbd
- systemd-boot-update

The reason these services are being disabled is because of the new
"system traits" feature. When the kickstart file runs the command
"systemctl preset-all" the sevices will be enabled by default. To
get the original state in AIO-SX the services will be disabled by
default.

This is part of the "system traits" feature. This work only
affects Debian.

Story: 2009968
Task: 46406

Test Plan

PASS Build package
PASS Build ISO
PASS Check for running systemd-network

Depends-On: https://review.opendev.org/c/starlingx/integ/+/853653

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I382beab7dcd491fe40941da936af15e7819c2307
---
 .../patches/disable-default-presets.patch     | 50 +++++++++++++++++++
 base/systemd/debian/patches/series            |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 base/systemd/debian/patches/disable-default-presets.patch

diff --git a/base/systemd/debian/patches/disable-default-presets.patch b/base/systemd/debian/patches/disable-default-presets.patch
new file mode 100644
index 000000000..451bf3b7d
--- /dev/null
+++ b/base/systemd/debian/patches/disable-default-presets.patch
@@ -0,0 +1,50 @@
+From 0200eca21c9d16751825779bec47945efc787b70 Mon Sep 17 00:00:00 2001
+From: Charles Short <charles.short@windriver.com>
+Date: Wed, 31 Aug 2022 12:54:33 -0400
+Subject: [PATCH] disable default presets
+
+Disable the following services:
+
+- systemd-timesyncd
+- systemd-networkd
+- systemd-network-generator
+- sysstemd-resolved
+- systemd-homed
+- systemd-userdbd
+- systemd-boot-update
+
+The reason these services are being disabled is because when systemctl
+preset-all is run to turn on the new "system traits" feature these
+services will be enabled when the machine is started, and we want to
+keep the original state that we had before the feature enabled.
+
+Signed-off-by: Charles Short <charles.short@windriver.com>
+---
+ presets/90-systemd.preset | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
+index d26087445c..ec72f0387f 100644
+--- a/presets/90-systemd.preset
++++ b/presets/90-systemd.preset
+@@ -16,12 +16,12 @@ enable remote-cryptsetup.target
+ enable machines.target
+ 
+ enable getty@.service
+-enable systemd-timesyncd.service
+-enable systemd-networkd.service
+-enable systemd-resolved.service
+-enable systemd-homed.service
+-enable systemd-userdbd.socket
+ enable systemd-pstore.service
++disable systemd-timesyncd.service
++disable systemd-networkd.service
++disable systemd-resolved.service
++disable systemd-homed.service
++disable systemd-userdbd.socket
+ 
+ disable console-getty.service
+ disable debug-shell.service
+-- 
+2.25.1
+
diff --git a/base/systemd/debian/patches/series b/base/systemd/debian/patches/series
index b460d5d3a..b143c1691 100644
--- a/base/systemd/debian/patches/series
+++ b/base/systemd/debian/patches/series
@@ -1,5 +1,6 @@
 # STX Patches
 851-inject-millisec-in-syslog-date.patch
+disable-default-presets.patch
 
 # This cluster of patches relates to fixing redhat bug #1819868
 # "systemd excessively reads mountinfo and udev in dense container environments"