From patchwork Mon Mar 18 21:09:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 10858563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF6311390 for ; Mon, 18 Mar 2019 21:09:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B3B2294A5 for ; Mon, 18 Mar 2019 21:09:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FEE529532; Mon, 18 Mar 2019 21:09:44 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 BFF0F2954A for ; Mon, 18 Mar 2019 21:09:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726971AbfCRVJn (ORCPT ); Mon, 18 Mar 2019 17:09:43 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:46400 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726953AbfCRVJn (ORCPT ); Mon, 18 Mar 2019 17:09:43 -0400 Received: from localhost.localdomain (89-156-252-9.rev.numericable.fr [89.156.252.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 87EDB56007D for ; Mon, 18 Mar 2019 22:09:39 +0100 (CET) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH 1/1] restorecond: use /run instead of /var/run Date: Mon, 18 Mar 2019 22:09:13 +0100 Message-Id: <20190318210913.2392-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Mon Mar 18 22:09:39 2019 +0100 (CET)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On most distributions, /var/run is a symbolic link to /run so using /var/run or /run lead to the same result. Nevertheless systemd started to warn about using /var/run in a service file, logging entries such as: /usr/lib/systemd/system/restorecond.service:8: PIDFile= references path below legacy directory /var/run/, updating /var/run/restorecond.pid → /run/restorecond.pid; please update the unit file accordingly. Switch to /run in order to follow this advice. Signed-off-by: Nicolas Iooss Acked-by: Petr Lautrbach --- restorecond/restorecond.c | 4 ++-- restorecond/restorecond.conf | 2 +- restorecond/restorecond.init | 2 +- restorecond/restorecond.service | 2 +- restorecond/utmpwatcher.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/restorecond/restorecond.c b/restorecond/restorecond.c index 7b984b298f79..d5f70fc2e2c1 100644 --- a/restorecond/restorecond.c +++ b/restorecond/restorecond.c @@ -84,7 +84,7 @@ static void done(void) { selabel_close(r_opts.hnd); } -static const char *pidfile = "/var/run/restorecond.pid"; +static const char *pidfile = "/run/restorecond.pid"; static int write_pid_file(void) { @@ -217,7 +217,7 @@ int main(int argc, char **argv) write_pid_file(); while (watch(master_fd, watch_file) == 0) { - }; + } watch_list_free(master_fd); close(master_fd); diff --git a/restorecond/restorecond.conf b/restorecond/restorecond.conf index c64e74758d2f..1a61ece384d7 100644 --- a/restorecond/restorecond.conf +++ b/restorecond/restorecond.conf @@ -2,7 +2,7 @@ /etc/resolv.conf /etc/samba/secrets.tdb /etc/updatedb.conf -/var/run/utmp +/run/utmp /var/log/wtmp /root/* /root/.ssh/* diff --git a/restorecond/restorecond.init b/restorecond/restorecond.init index 775c52b0ce7c..c1cbb247fa91 100644 --- a/restorecond/restorecond.init +++ b/restorecond/restorecond.init @@ -9,7 +9,7 @@ # # processname: /usr/sbin/restorecond # config: /etc/selinux/restorecond.conf -# pidfile: /var/run/restorecond.pid +# pidfile: /run/restorecond.pid # # Return values according to LSB for all commands but status: # 0 - success diff --git a/restorecond/restorecond.service b/restorecond/restorecond.service index 0511a1c740ac..6bce99d39735 100644 --- a/restorecond/restorecond.service +++ b/restorecond/restorecond.service @@ -6,7 +6,7 @@ ConditionSecurity=selinux [Service] Type=forking ExecStart=/usr/sbin/restorecond -PIDFile=/var/run/restorecond.pid +PIDFile=/run/restorecond.pid [Install] WantedBy=multi-user.target diff --git a/restorecond/utmpwatcher.c b/restorecond/utmpwatcher.c index 62ad2e98aff3..8660520370de 100644 --- a/restorecond/utmpwatcher.c +++ b/restorecond/utmpwatcher.c @@ -49,7 +49,7 @@ unsigned int utmpwatcher_handle(int inotify_fd, int wd) { int changed = 0; struct utmp u; - const char *utmp_path = "/var/run/utmp"; + const char *utmp_path = "/run/utmp"; struct stringsList *prev_utmp_ptr = utmp_ptr; if (wd != utmp_wd) return -1;