From 840b0c3d7b4cbc25cb962fc90de0b2f81ede150d Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Thu, 1 Aug 2019 16:38:12 +0200 Subject: [PATCH] Lower the number (and priority) of crash-worker sysctl config file Install sysctl file with 70 prefix instead of 99. This will allow overriding variables by creating eg. 99-local.conf file with appropriate vars. Change-Id: I88e25839a59a66896ab540d0836776b2d64225e5 --- packaging/crash-worker.spec | 2 +- .../{99-crash-manager.conf.in => 70-crash-manager.conf.in} | 0 src/crash-manager/CMakeLists.txt | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/crash-manager/{99-crash-manager.conf.in => 70-crash-manager.conf.in} (100%) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 51abe84..dd328cb 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -199,7 +199,7 @@ sed -i "/${pattern}/D" %{_sysconfdir}/ld.so.preload %dir %{crash_path} %dir %{crash_temp} %{_sysconfdir}/crash-manager.conf -%attr(-,root,root) %{_prefix}/lib/sysctl.d/99-crash-manager.conf +%attr(-,root,root) %{_prefix}/lib/sysctl.d/70-crash-manager.conf %attr(0750,system_fw,system_fw) %{_bindir}/crash-manager %attr(0750,system_fw,system_fw) %{_bindir}/dump_systemstate %{_sysconfdir}/dump_systemstate.conf.d/files/files.conf.example diff --git a/src/crash-manager/99-crash-manager.conf.in b/src/crash-manager/70-crash-manager.conf.in similarity index 100% rename from src/crash-manager/99-crash-manager.conf.in rename to src/crash-manager/70-crash-manager.conf.in diff --git a/src/crash-manager/CMakeLists.txt b/src/crash-manager/CMakeLists.txt index 198a92c..ce803d8 100644 --- a/src/crash-manager/CMakeLists.txt +++ b/src/crash-manager/CMakeLists.txt @@ -48,13 +48,13 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) CONFIGURE_FILE(500.${PROJECT_NAME}-upgrade.sh.in 500.${PROJECT_NAME}-upgrade.sh @ONLY) -CONFIGURE_FILE(99-${PROJECT_NAME}.conf.in 99-${PROJECT_NAME}.conf @ONLY) +CONFIGURE_FILE(70-${PROJECT_NAME}.conf.in 70-${PROJECT_NAME}.conf @ONLY) INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}/crash-manager.conf DESTINATION /etc PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}/99-${PROJECT_NAME}.conf +INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}/70-${PROJECT_NAME}.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sysctl.d PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) -- 2.7.4