From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EABC138330 for ; Thu, 8 Sep 2016 16:55:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 544D4E00B3; Thu, 8 Sep 2016 16:55:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08FA6E00B3 for ; Thu, 8 Sep 2016 16:54:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E9DF340662 for ; Thu, 8 Sep 2016 16:54:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB267246E for ; Thu, 8 Sep 2016 16:54:55 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1473353600.ba10793b0b85b11fae04e6526716c6f7976afde1.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/procfs.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: ba10793b0b85b11fae04e6526716c6f7976afde1 X-VCS-Branch: master Date: Thu, 8 Sep 2016 16:54:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d351b650-1eea-437c-b0e2-051895df3eec X-Archives-Hash: 03a23f716152ac90fabd6b0df043b1b0 commit: ba10793b0b85b11fae04e6526716c6f7976afde1 Author: William Hubbs gmail com> AuthorDate: Tue Sep 6 23:15:27 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Sep 8 16:53:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ba10793b init.d/procfs: fix binfmt_misc module load warning This reworks the logic so that the warning about configuring the binfmt_misc module is only displayed if the module actually has to be loaded. init.d/procfs.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/init.d/procfs.in b/init.d/procfs.in index 055b5f4..36eca7c 100644 --- a/init.d/procfs.in +++ b/init.d/procfs.in @@ -22,8 +22,10 @@ depend() start() { # Setup Kernel Support for miscellaneous Binary Formats - if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then - if modprobe -q binfmt-misc; then + if [ -d /proc/sys/fs/binfmt_misc ] && + [! -e /proc/sys/fs/binfmt_misc/register ]; then + if ! grep -qs binfmt_misc /proc/filesystems && + modprobe -q binfmt-misc; then ewarn "The binfmt-misc module needs to be configured in \ @SYSCONFDIR@/conf.d/modules or built in." fi