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 1DF2D139694 for ; Tue, 7 Mar 2017 23:54:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7725AE0D0D; Tue, 7 Mar 2017 23:54:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5850EE0D0D for ; Tue, 7 Mar 2017 23:54:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8323F34164D for ; Tue, 7 Mar 2017 23:54:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29FD0606E for ; Tue, 7 Mar 2017 23:54:37 +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: <1488930582.6a79aef0159d7035778fd852b26ecfac903cd029.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: 6a79aef0159d7035778fd852b26ecfac903cd029 X-VCS-Branch: master Date: Tue, 7 Mar 2017 23:54:37 +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: c8fd6fc3-1169-4b56-8c99-38bc3708f8ea X-Archives-Hash: aa58c0df236f8a21ca1067e56c79c4da commit: 6a79aef0159d7035778fd852b26ecfac903cd029 Author: William Hubbs gmail com> AuthorDate: Tue Mar 7 23:40:18 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Mar 7 23:49:42 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6a79aef0 init.d/sysfs: Do not load efivarfs module My understanding is that the kernel can autoload this module. If it doesn't, the module should be built in or loaded from an initramfs. This fixes https://github.com/openrc/openrc/pulls/112. init.d/sysfs.in | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 6d6ec62c..ff0c4e7d 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -15,7 +15,7 @@ sysfs_opts=nodev,noexec,nosuid depend() { - want modules + use modules keyword -docker -lxc -prefix -systemd-nspawn -vserver } @@ -102,19 +102,12 @@ mount_misc() # 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 ] && - modprobe -q efivarfs; then - ewarn "The efivarfs module needs to be configured in " \ - "@SYSCONFDIR@/conf.d/modules or built in" - fi if [ -d /sys/firmware/efi/efivars ] && ! mountinfo -q /sys/firmware/efi/efivars; then - if grep -qs efivarfs /proc/filesystems; then - ebegin "Mounting efivarfs filesystem" - mount -n -t efivarfs -o ${sysfs_opts} \ - efivarfs /sys/firmware/efi/efivars - eend $? - fi + ebegin "Mounting efivarfs filesystem" + mount -n -t efivarfs -o ${sysfs_opts} \ + efivarfs /sys/firmware/efi/efivars + eend $? fi fi }