From 01a6f9880b9057a45f212cf6028bf7a24b79812e Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Fri, 4 Mar 2022 14:37:13 +0000 Subject: [PATCH] debian: Fix config-gate packaging This commit does several things at once: - Ensures that the config.service starts - Ensures that the preset are installed when the packages are installed. Test Plan PASS Build packaage PASS Build and Install ISO PASS Ensure config.service is enabled. Story: 2009101 Task: 44678 Depends-On: https://review.opendev.org/c/starlingx/integ/+/831950 Signed-off-by: Chuck Short Change-Id: Ice4cb8e1139b73fe63d12253d8d3a86b0fa3dd80 --- config-gate/debian/deb_folder/config-gate-worker.install | 1 + config-gate/debian/deb_folder/config-gate.install | 1 + config-gate/debian/deb_folder/rules | 3 ++- .../debian/deb_folder/systemd/00-config-gate-worker.preset | 1 + config-gate/debian/deb_folder/systemd/00-config-gate.preset | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 config-gate/debian/deb_folder/systemd/00-config-gate-worker.preset create mode 100644 config-gate/debian/deb_folder/systemd/00-config-gate.preset diff --git a/config-gate/debian/deb_folder/config-gate-worker.install b/config-gate/debian/deb_folder/config-gate-worker.install index 1dcdc9871f..4f1b860a0b 100644 --- a/config-gate/debian/deb_folder/config-gate-worker.install +++ b/config-gate/debian/deb_folder/config-gate-worker.install @@ -1,2 +1,3 @@ lib/systemd/system/worker-config-gate.service usr/sbin/wait_for_worker_config_init.sh +debian/systemd/00-config-gate-worker.preset etc/systemd/system-preset diff --git a/config-gate/debian/deb_folder/config-gate.install b/config-gate/debian/deb_folder/config-gate.install index b5285101d4..12d38a53a2 100644 --- a/config-gate/debian/deb_folder/config-gate.install +++ b/config-gate/debian/deb_folder/config-gate.install @@ -1,2 +1,3 @@ usr/sbin/wait_for_config_init.sh lib/systemd/system/config.service +debian/systemd/00-config-gate.preset /etc/systemd/system-preset diff --git a/config-gate/debian/deb_folder/rules b/config-gate/debian/deb_folder/rules index 3a2e96711a..2f83250671 100755 --- a/config-gate/debian/deb_folder/rules +++ b/config-gate/debian/deb_folder/rules @@ -12,4 +12,5 @@ override_dh_auto_install: SYSTEMDDIR=`pwd`/debian/tmp/lib/systemd/system install override_dh_installsystemd: - dh_installsystemd -pconfig-gate-worker worker-config-gate.service + dh_installsystemd -pconfig-gate-worker --no-start worker-config-gate.service + dh_installsystemd -pconfig-gate --no-start config.service diff --git a/config-gate/debian/deb_folder/systemd/00-config-gate-worker.preset b/config-gate/debian/deb_folder/systemd/00-config-gate-worker.preset new file mode 100644 index 0000000000..cebd9b1158 --- /dev/null +++ b/config-gate/debian/deb_folder/systemd/00-config-gate-worker.preset @@ -0,0 +1 @@ +enable config.service diff --git a/config-gate/debian/deb_folder/systemd/00-config-gate.preset b/config-gate/debian/deb_folder/systemd/00-config-gate.preset new file mode 100644 index 0000000000..f31c5b17b0 --- /dev/null +++ b/config-gate/debian/deb_folder/systemd/00-config-gate.preset @@ -0,0 +1 @@ +disable worker-config-gate.service