From patchwork Fri Aug 25 10:40:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Morey-Chaisemartin X-Patchwork-Id: 9921697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A282E60349 for ; Fri, 25 Aug 2017 10:41:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 944E627F17 for ; Fri, 25 Aug 2017 10:41:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 893E027F7F; Fri, 25 Aug 2017 10:41:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AA3F27F17 for ; Fri, 25 Aug 2017 10:40:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754734AbdHYKkE (ORCPT ); Fri, 25 Aug 2017 06:40:04 -0400 Received: from mx2.suse.de ([195.135.220.15]:40828 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754454AbdHYKkE (ORCPT ); Fri, 25 Aug 2017 06:40:04 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2E612AE72 for ; Fri, 25 Aug 2017 10:40:03 +0000 (UTC) From: Nicolas Morey-Chaisemartin Subject: [PATCHv2 rdma-core 1/5] kernel-boot: Add cmake variable to configure the path to systemd-* binaries To: linux-rdma@vger.kernel.org References: <88926674-d707-6f00-e9a1-e2a823fec323@suse.de> Openpgp: preference=signencrypt Message-ID: <78ca92c2-8422-e22d-1efa-1077946d2064@suse.de> Date: Fri, 25 Aug 2017 12:40:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:56.0) Gecko/20100101 Thunderbird/56.0 MIME-Version: 1.0 In-Reply-To: <88926674-d707-6f00-e9a1-e2a823fec323@suse.de> Content-Language: fr-xx-classique+reforme1990 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Debian uses /lib/systemd SUSE uses /usr/lib/systemd RHEL/Fedora can use both. Signed-off-by: Nicolas Morey-Chaisemartin --- CMakeLists.txt | 2 ++ kernel-boot/rdma-load-modules@.service.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2324cf49..a2464ec5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,8 @@ set(CMAKE_INSTALL_INITDDIR "${CMAKE_INSTALL_SYSCONFDIR}/init.d" CACHE PATH "Location for init.d files") set(CMAKE_INSTALL_SYSTEMD_SERVICEDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" CACHE PATH "Location for systemd service files") +set(CMAKE_INSTALL_SYSTEMD_BINDIR "/lib/systemd" + CACHE PATH "Location for systemd extra binaries") set(ACM_PROVIDER_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/ibacm" CACHE PATH "Location for ibacm provider plugin shared library files.") diff --git a/kernel-boot/rdma-load-modules@.service.in b/kernel-boot/rdma-load-modules@.service.in index d381bc5b..c390a8cc 100644 --- a/kernel-boot/rdma-load-modules@.service.in +++ b/kernel-boot/rdma-load-modules@.service.in @@ -21,5 +21,5 @@ ConditionCapability=CAP_SYS_MODULE [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/lib/systemd/systemd-modules-load @CMAKE_INSTALL_FULL_SYSCONFDIR@/rdma/modules/%I.conf +ExecStart=@CMAKE_INSTALL_SYSTEMD_BINDIR@/systemd-modules-load @CMAKE_INSTALL_FULL_SYSCONFDIR@/rdma/modules/%I.conf TimeoutSec=90s