starlingx/fault
Code Issues Proposed changes

Revert "Fix failing FM services on Debian"

Browse Source 
This reverts commit 1bb9c1542cba8cf93383beea8103977c8b0851bf.

Reason for revert: Error on build-image, fm-mgr fails on preinst. Symlink: "File exists"

Change-Id: I235ef93446071a7a2f051489f7462f3fb454a20c
This commit is contained in:
Iago Rodriguez Regiani 2022-02-14 22:12:37 +00:00
parent 1bb9c1542c
commit 3074e4e4c7
11 changed files with 5 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fm-api/debian/deb_folder/control
View File

@ -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.

1
fm-mgr/centos/fm-mgr.spec
View File

@ -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}

2
fm-mgr/debian/deb_folder/control
View File

@ -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.

1
fm-mgr/debian/deb_folder/fm-mgr.install
View File

@ -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

6
fm-mgr/debian/deb_folder/fm-mgr.preinst
View File

@ -1,6 +0,0 @@
#!/bin/sh
set -e
ln -s /usr/bin/fmManager /usr/local/bin/fmManager
#DEBHELPER#

17
fm-mgr/debian/deb_folder/fminit.service
View File

@ -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

3
fm-mgr/debian/deb_folder/rules
View File

@ -12,6 +12,3 @@ override_dh_auto_install:
LIBDIR=/usr/lib \
SYSCONFDIR=/etc \
install
override_dh_installsystemd:
dh_installsystemd --no-enable --name fminit

1
fm-mgr/sources/Makefile
View File

@ -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

15
fm-rest-api/debian/deb_folder/fm-api.service
View File

@ -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

7
fm-rest-api/debian/deb_folder/postinst
View File

@ -1,7 +0,0 @@
#!/bin/sh
set -e
chown fm:fm etc/fm/fm.conf
#DEBHELPER#

4
fm-rest-api/debian/deb_folder/rules
View File

@ -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