From 1f38794699cadc1e2c1c775d17093baa7e755583 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Sat, 4 Feb 2017 20:10:12 +0900 Subject: [PATCH] pmqos: Rename the pmqos filename from 'pmqos.conf' to 'pass-pmqos.conf' This patch just renames the file of pmqos configuration file to keep the consistency of the format of pass configuration file. Change-Id: Ib195e698c389ff5f044b8b3bad5cc27600ceb5ad Signed-off-by: Chanwoo Choi --- CMakeLists.txt | 2 +- packaging/pass.spec | 2 +- src/pmqos/{pmqos.conf => pass-pmqos.conf} | 0 src/pmqos/pmqos.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/pmqos/{pmqos.conf => pass-pmqos.conf} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2b683a..2116f1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/pass/pass-cluster1.conf DESTINATIO INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/pass/pass-cluster2.conf DESTINATION /etc/pass) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/pass/pass-cluster3.conf DESTINATION /etc/pass) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/pass/pass-cluster4.conf DESTINATION /etc/pass) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/pmqos/pmqos.conf DESTINATION /etc/pass) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/pmqos/pass-pmqos.conf DESTINATION /etc/pass) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/packaging/pass.spec b/packaging/pass.spec index d87e4dd..07677d2 100644 --- a/packaging/pass.spec +++ b/packaging/pass.spec @@ -117,7 +117,7 @@ systemctl daemon-reload %config %{_sysconfdir}/pass/pass-cluster2.conf %config %{_sysconfdir}/pass/pass-cluster3.conf %config %{_sysconfdir}/pass/pass-cluster4.conf -%config %{_sysconfdir}/pass/pmqos.conf +%config %{_sysconfdir}/pass/pass-pmqos.conf %{_bindir}/%{daemon_name} %{_unitdir}/multi-user.target.wants/%{daemon_name}.service %{_unitdir}/sockets.target.wants/%{daemon_name}.socket diff --git a/src/pmqos/pmqos.conf b/src/pmqos/pass-pmqos.conf similarity index 100% rename from src/pmqos/pmqos.conf rename to src/pmqos/pass-pmqos.conf diff --git a/src/pmqos/pmqos.c b/src/pmqos/pmqos.c index dff3894..395a513 100644 --- a/src/pmqos/pmqos.c +++ b/src/pmqos/pmqos.c @@ -34,7 +34,7 @@ #define DEFAULT_PMQOS_TIMER 3000 -#define PMQOS_CONF_PATH "/etc/pass/pmqos.conf" +#define PMQOS_CONF_PATH "/etc/pass/pass-pmqos.conf" #define MILLISECONDS(tv) ((tv.tv_sec)*1000 + (tv.tv_nsec)/1000000) #define DELTA(a, b) (MILLISECONDS(a) - MILLISECONDS(b)) -- 2.7.4