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 9DBEF139695 for ; Sun, 12 Mar 2017 18:56:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B799221C122; Sun, 12 Mar 2017 18:56:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9894321C122 for ; Sun, 12 Mar 2017 18:56:34 +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 75517340F53 for ; Sun, 12 Mar 2017 18:56:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8A1865ED for ; Sun, 12 Mar 2017 18:56:31 +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: <1489344949.5f5b1f7cbefd0bc14352e86a9c33260266f98d9b.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/sysfs.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 5f5b1f7cbefd0bc14352e86a9c33260266f98d9b X-VCS-Branch: master Date: Sun, 12 Mar 2017 18:56:31 +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: 6cb46056-0bd8-4753-adbf-bddc13b70770 X-Archives-Hash: 4ec0c75c2289abeafe23f560c665555f commit: 5f5b1f7cbefd0bc14352e86a9c33260266f98d9b Author: William Hubbs gmail com> AuthorDate: Sun Mar 12 18:55:49 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Mar 12 18:55:49 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5f5b1f7c init.d/sysfs.in: efivarfs tweaks Since we check for /sys/firmware/efi/efivars, we do not need to check for /sys/firmware/efi Since Failing to mount efivarfs is not critical, we silence the error message from mount. init.d/sysfs.in | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 8030ea84..e493f584 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -98,16 +98,12 @@ mount_misc() fi # set up kernel support for efivarfs - # The presence of /sys/firmware/efi indicates that the system was - # booted in efi mode. - if [ -d /sys/firmware/efi ]; then - if [ -d /sys/firmware/efi/efivars ] && - ! mountinfo -q /sys/firmware/efi/efivars; then - ebegin "Mounting efivarfs filesystem" - mount -n -t efivarfs -o ${sysfs_opts} \ - efivarfs /sys/firmware/efi/efivars - eend $? - fi + if [ -d /sys/firmware/efi/efivars ] && + ! mountinfo -q /sys/firmware/efi/efivars; then + ebegin "Mounting efivarfs filesystem" + mount -n -t efivarfs -o ${sysfs_opts} \ + efivarfs /sys/firmware/efi/efivars 2> /dev/null + eend 0 fi }