From 3074e4e4c7db4ca44d21bad86b5193818d516654 Mon Sep 17 00:00:00 2001 From: Iago Rodriguez Regiani Date: Mon, 14 Feb 2022 22:12:37 +0000 Subject: [PATCH] Revert "Fix failing FM services on Debian" This reverts commit 1bb9c1542cba8cf93383beea8103977c8b0851bf. Reason for revert: Error on build-image, fm-mgr fails on preinst. Symlink: "File exists" Change-Id: I235ef93446071a7a2f051489f7462f3fb454a20c --- fm-api/debian/deb_folder/control | 2 +- fm-mgr/centos/fm-mgr.spec | 1 - fm-mgr/debian/deb_folder/control | 2 +- fm-mgr/debian/deb_folder/fm-mgr.install | 1 + fm-mgr/debian/deb_folder/fm-mgr.preinst | 6 ------ fm-mgr/debian/deb_folder/fminit.service | 17 ----------------- fm-mgr/debian/deb_folder/rules | 3 --- fm-mgr/sources/Makefile | 1 + fm-rest-api/debian/deb_folder/fm-api.service | 15 --------------- fm-rest-api/debian/deb_folder/postinst | 7 ------- fm-rest-api/debian/deb_folder/rules | 4 +--- 11 files changed, 5 insertions(+), 54 deletions(-) delete mode 100644 fm-mgr/debian/deb_folder/fm-mgr.preinst delete mode 100644 fm-mgr/debian/deb_folder/fminit.service delete mode 100644 fm-rest-api/debian/deb_folder/fm-api.service delete mode 100644 fm-rest-api/debian/deb_folder/postinst diff --git a/fm-api/debian/deb_folder/control b/fm-api/debian/deb_folder/control index 5073d7fa..6cb4d250 100644 --- a/fm-api/debian/deb_folder/control +++ b/fm-api/debian/deb_folder/control @@ -8,7 +8,7 @@ Homepage: https://www.starlingx.io Package: python3-fm-api Architecture: all -Depends: ${python3:Depends}, ${misc:Depends}, centos-debian-compat +Depends: ${python3:Depends}, ${misc:Depends} Description: Starlingx fault management api Provides the the APIs for applications to raise/clear/update active alarms. diff --git a/fm-mgr/centos/fm-mgr.spec b/fm-mgr/centos/fm-mgr.spec index acd2d8bc..eea6cb89 100644 --- a/fm-mgr/centos/fm-mgr.spec +++ b/fm-mgr/centos/fm-mgr.spec @@ -41,7 +41,6 @@ make DESTDIR=%{buildroot} \ UNITDIR=%{_unitdir} \ MAJOR=$MAJOR MINOR=$MINOR \ install -install -m 644 fminit.service %{buildroot}%{_unitdir}/fminit.service %clean rm -rf %{buildroot} diff --git a/fm-mgr/debian/deb_folder/control b/fm-mgr/debian/deb_folder/control index e348481a..c4df5294 100644 --- a/fm-mgr/debian/deb_folder/control +++ b/fm-mgr/debian/deb_folder/control @@ -10,6 +10,6 @@ Rules-Requires-Root: no Package: fm-mgr Section: libs Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, centos-debian-compat +Depends: ${misc:Depends}, ${shlibs:Depends} Description: StarlingX Fault Manager This package contains StarlingX fm-mgr project. diff --git a/fm-mgr/debian/deb_folder/fm-mgr.install b/fm-mgr/debian/deb_folder/fm-mgr.install index 0812ed20..bb823ba8 100644 --- a/fm-mgr/debian/deb_folder/fm-mgr.install +++ b/fm-mgr/debian/deb_folder/fm-mgr.install @@ -1,3 +1,4 @@ usr/bin/fmManager etc/init.d/fminit etc/logrotate.d/fm.logrotate +usr/lib/systemd/system/fminit.service lib/systemd/system diff --git a/fm-mgr/debian/deb_folder/fm-mgr.preinst b/fm-mgr/debian/deb_folder/fm-mgr.preinst deleted file mode 100644 index 11dcc1cc..00000000 --- a/fm-mgr/debian/deb_folder/fm-mgr.preinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e - -ln -s /usr/bin/fmManager /usr/local/bin/fmManager - -#DEBHELPER# diff --git a/fm-mgr/debian/deb_folder/fminit.service b/fm-mgr/debian/deb_folder/fminit.service deleted file mode 100644 index 900fdd09..00000000 --- a/fm-mgr/debian/deb_folder/fminit.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=StarlingX Fault Management Initialization -After=network.target syslog.target - -[Service] -Type=forking -Restart=no -KillMode=process -RemainAfterExit=yes -ExecStart=/etc/init.d/fminit start -ExecStop=/etc/init.d/fminit stop -ExecReload=/etc/init.d/fminit reload -PIDFile=/var/run/fmManager.pid - -[Install] -WantedBy=multi-user.target - diff --git a/fm-mgr/debian/deb_folder/rules b/fm-mgr/debian/deb_folder/rules index 181be8fb..6bee34a0 100755 --- a/fm-mgr/debian/deb_folder/rules +++ b/fm-mgr/debian/deb_folder/rules @@ -12,6 +12,3 @@ override_dh_auto_install: LIBDIR=/usr/lib \ SYSCONFDIR=/etc \ install - -override_dh_installsystemd: - dh_installsystemd --no-enable --name fminit diff --git a/fm-mgr/sources/Makefile b/fm-mgr/sources/Makefile index 85aba2c1..0d683c36 100755 --- a/fm-mgr/sources/Makefile +++ b/fm-mgr/sources/Makefile @@ -35,3 +35,4 @@ install: install -m 755 fminit $(DESTDIR)$(SYSCONFDIR)/init.d/fminit install -m 755 fmManager $(DESTDIR)$(BINDIR)/fmManager install -m 644 fm.logrotate $(DESTDIR)$(SYSCONFDIR)/logrotate.d/fm.logrotate + install -m 644 fminit.service $(DESTDIR)$(UNITDIR)/fminit.service diff --git a/fm-rest-api/debian/deb_folder/fm-api.service b/fm-rest-api/debian/deb_folder/fm-api.service deleted file mode 100644 index 2026e5f4..00000000 --- a/fm-rest-api/debian/deb_folder/fm-api.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Fault Management REST API Service -After=nfscommon.service sw-patch.service -After=network-online.target systemd-udev-settle.service - -[Service] -Type=simple -RemainAfterExit=yes -User=root -ExecStart=/etc/init.d/fm-api start -ExecStop=/etc/init.d/fm-api stop -PIDFile=/var/run/fm-api.pid - -[Install] -WantedBy=multi-user.target diff --git a/fm-rest-api/debian/deb_folder/postinst b/fm-rest-api/debian/deb_folder/postinst deleted file mode 100644 index 15935346..00000000 --- a/fm-rest-api/debian/deb_folder/postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -chown fm:fm etc/fm/fm.conf - -#DEBHELPER# diff --git a/fm-rest-api/debian/deb_folder/rules b/fm-rest-api/debian/deb_folder/rules index 041cd225..d7952159 100755 --- a/fm-rest-api/debian/deb_folder/rules +++ b/fm-rest-api/debian/deb_folder/rules @@ -13,6 +13,7 @@ export UNITDIR=$(ROOT)/lib/systemd/system override_dh_auto_install: install -d -m 755 $(UNITDIR) + install -p -D -m 644 scripts/fm-api.service $(UNITDIR)/fm-api.service install -d -m 755 $(INITDIR) install -p -D -m 755 scripts/fm-api $(INITDIR)/fm-api install -d -m 755 $(PMONDDIR) @@ -26,9 +27,6 @@ override_dh_auto_install: override_dh_fixperms: dh_fixperms -Xfm.conf -override_dh_installsystemd: - dh_installsystemd --name fm-api - ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: # (tbogue) FIXME