From dcf746cf17ce84e0a749b7dcde3727b921b52ba4 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Sat, 5 Mar 2022 14:54:06 +0000 Subject: [PATCH] debian: Fix controllerconfig packaging issues - Ensure the controllerconfig.service starts. - Ensure that the preset are installed when the packages are installed. Test Plan PASS Build package and ISO PASS Boot and check for controllerconfig.service Story: 2009101 Task: 43023 Signed-off-by: Chuck Short Change-Id: Id88ebdea6735ef8fab2d8aa73ede50104abdef33 --- controllerconfig/debian/deb_folder/controllerconfig.install | 1 + controllerconfig/debian/deb_folder/rules | 2 +- .../debian/deb_folder/systemd/00-controllerconfig.preset | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 controllerconfig/debian/deb_folder/systemd/00-controllerconfig.preset diff --git a/controllerconfig/debian/deb_folder/controllerconfig.install b/controllerconfig/debian/deb_folder/controllerconfig.install index e042dffb09..3c1d3f39dc 100644 --- a/controllerconfig/debian/deb_folder/controllerconfig.install +++ b/controllerconfig/debian/deb_folder/controllerconfig.install @@ -3,3 +3,4 @@ etc/goenabled.d/* usr/lib/python*/dist-packages/* etc/init.d/* etc/upgrade.d/* +debian/systemd/00-controllerconfig.preset etc/systemd/system-preset diff --git a/controllerconfig/debian/deb_folder/rules b/controllerconfig/debian/deb_folder/rules index 40aa7bebbe..4adfa7f48a 100755 --- a/controllerconfig/debian/deb_folder/rules +++ b/controllerconfig/debian/deb_folder/rules @@ -37,7 +37,7 @@ override_dh_auto_test: endif override_dh_installsystemd: - dh_installsystemd -p controllerconfig controllerconfig.service + dh_installsystemd -pcontrollerconfig --no-start controllerconfig.service override_dh_python3: dh_python3 --shebang=/usr/bin/python3 diff --git a/controllerconfig/debian/deb_folder/systemd/00-controllerconfig.preset b/controllerconfig/debian/deb_folder/systemd/00-controllerconfig.preset new file mode 100644 index 0000000000..7f488d678a --- /dev/null +++ b/controllerconfig/debian/deb_folder/systemd/00-controllerconfig.preset @@ -0,0 +1 @@ +enable controllerconfig.service