diff --git a/cta.spec.in b/cta.spec.in index 14846ac09c506d9e533158d86c35b717652dec7b..73b171383303fd46cd839b58524effe703336a09 100644 --- a/cta.spec.in +++ b/cta.spec.in @@ -306,7 +306,6 @@ Tools to faciliate working with acsd in cta #%attr(0644,root,root) %doc /usr/share/man/man1/cta-acsd.1cta.gz %attr(0755,root,root) %{_bindir}/cta-acsd %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-acsd.conf -%attr(0644,root,root) %config(noreplace) /etc/sysconfig/cta-acsd %attr(0644,root,root) /etc/systemd/system/cta-acsd.service %post -n cta-acsd diff --git a/mediachanger/acs/daemon/CMakeLists.txt b/mediachanger/acs/daemon/CMakeLists.txt index 1dfee71cbc555055c2cd396987b554543971b81f..814accaca1a43abc17e47203afba65552d533737 100644 --- a/mediachanger/acs/daemon/CMakeLists.txt +++ b/mediachanger/acs/daemon/CMakeLists.txt @@ -47,7 +47,6 @@ set_property (TARGET cta-acsd APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH}) install (FILES cta-acsd.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cta) install (TARGETS cta-acsd DESTINATION /usr/bin) install (FILES cta-acsd.logrotate DESTINATION /etc/logrotate.d RENAME cta-acsd) -install (FILES cta-acsd.sysconfig DESTINATION /etc/sysconfig RENAME cta-acsd) install (FILES cta-acsd.service DESTINATION /etc/systemd/system) add_library (ctamediachangeracsdaemonunittests SHARED AcsdCmdLineTest.cpp AcsdCmdLine.cpp) diff --git a/mediachanger/acs/daemon/cta-acsd.service b/mediachanger/acs/daemon/cta-acsd.service index b6c4c395248e37320ddcd74d158645c546e3810e..c2ce4f78eda5a7790feb5590c98105f5a4b94bc1 100644 --- a/mediachanger/acs/daemon/cta-acsd.service +++ b/mediachanger/acs/daemon/cta-acsd.service @@ -3,8 +3,7 @@ Description=CERN Tape Archive (CTA) acsd daemon After=syslog.target network-online.target [Service] -EnvironmentFile=-/etc/sysconfig/cta-acsd -ExecStart=/usr/bin/cta-acsd ${CTA_ACSD_OPTIONS} +ExecStart=/usr/bin/cta-acsd LimitCORE=infinity Type=forking Restart=no diff --git a/mediachanger/acs/daemon/cta-acsd.sysconfig b/mediachanger/acs/daemon/cta-acsd.sysconfig deleted file mode 100644 index 8131adf1c7a76484dc10974d51bbd8a8a93b349f..0000000000000000000000000000000000000000 --- a/mediachanger/acs/daemon/cta-acsd.sysconfig +++ /dev/null @@ -1,5 +0,0 @@ - -# Arguments for the rmcd server daemon -# -smc_ldr is the picker device as defined in /dev. -# -f keep process in the foreground, do not fork. -#CTA_ACSD_OPTIONS="/dev/sg9"