From 771e6ca7341eced11ca3ad846216a111188995b9 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Thu, 25 Nov 2021 10:38:17 -0500 Subject: [PATCH] Fix controllerconfig service warning on boot When the controllerconfig service starts the following warning is emitted in the dmesg: Standard output type syslog+console is obsolete, automatically updating to journal+console. Please update your unit file, and consider removing the setting altogether. This is due to a change in systemd-246, where syslog is no longer supported. Change only for Debian so we avoid a CentOS retest. Copied the original controllerconfig.service and replaced the 'syslog+console' with 'journal+console'. Signed-off-by: Charles Short Change-Id: I5b41005ae53a1a9dd75dc665a217d607fa80c3f1 --- .../debian/deb_folder/controllerconfig.install | 1 - .../debian/deb_folder/controllerconfig.service | 17 +++++++++++++++++ controllerconfig/debian/deb_folder/rules | 3 +-- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 controllerconfig/debian/deb_folder/controllerconfig.service diff --git a/controllerconfig/debian/deb_folder/controllerconfig.install b/controllerconfig/debian/deb_folder/controllerconfig.install index 18df32b448..e042dffb09 100644 --- a/controllerconfig/debian/deb_folder/controllerconfig.install +++ b/controllerconfig/debian/deb_folder/controllerconfig.install @@ -3,4 +3,3 @@ etc/goenabled.d/* usr/lib/python*/dist-packages/* etc/init.d/* etc/upgrade.d/* -lib/systemd/system/* diff --git a/controllerconfig/debian/deb_folder/controllerconfig.service b/controllerconfig/debian/deb_folder/controllerconfig.service new file mode 100644 index 0000000000..1c21bf3c31 --- /dev/null +++ b/controllerconfig/debian/deb_folder/controllerconfig.service @@ -0,0 +1,17 @@ +[Unit] +Description=controllerconfig service +After=syslog.target network.target remote-fs.target sw-patch.service sysinv-agent.service +After=network-online.target +Before=config.service + +[Service] +Type=simple +ExecStart=/etc/init.d/controller_config start +ExecStop= +ExecReload= +StandardOutput=journal+console +StandardError=journal+console +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/controllerconfig/debian/deb_folder/rules b/controllerconfig/debian/deb_folder/rules index e6ff38dee8..40aa7bebbe 100755 --- a/controllerconfig/debian/deb_folder/rules +++ b/controllerconfig/debian/deb_folder/rules @@ -22,7 +22,6 @@ override_dh_install: install -d -m 755 $(ROOT)/etc/upgrade.d install -p -D -m 755 upgrade-scripts/* $(ROOT)/etc/upgrade.d install -d -m 755 $(ROOT)/lib/systemd/system - install -p -D -m 664 scripts/controllerconfig.service $(ROOT)/lib/systemd/system/controllerconfig.service dh_install override_dh_fixperms: @@ -38,7 +37,7 @@ override_dh_auto_test: endif override_dh_installsystemd: - dh_installsystemd --name controllerconfig + dh_installsystemd -p controllerconfig controllerconfig.service override_dh_python3: dh_python3 --shebang=/usr/bin/python3