emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init.d/sysfs: fix efivarfs handling

Browse Source 
Separate loading the module, if it isn't built in or loaded, from
mounting the file system.

This also makes sure the warning about configuring the module in
/etc/conf.d/modules or building it in is displayed only if it is loaded
successfully.

X-Gentoo-Bug: 595836
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=595836
This commit is contained in:
William Hubbs 2016-10-04 11:51:24 -05:00
parent 6710316a18
commit 6a0c033a64
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
init.d/sysfs.in
View File

@ -98,15 +98,13 @@ mount_misc()
fi fi
fi fi
# setup up kernel support for efivarfs # set up kernel support for efivarfs
# slightly complicated, as if it's build as a module but NOT yet loaded, if [ ! -d /sys/module/efivarfs ] && modprobe -q efivarfs; then
# it will NOT appear in /proc/filesystems yet
if [ -d /sys/firmware/efi/efivars ] \
&& ! mountinfo -q /sys/firmware/efi/efivars; then
if modprobe -q efivarfs; then
ewarn "The efivarfs module needs to be configured in " \ ewarn "The efivarfs module needs to be configured in " \
"@SYSCONFDIR@/conf.d/modules or built in" "@SYSCONFDIR@/conf.d/modules or built in"
fi fi
if [ -d /sys/firmware/efi/efivars ] &&
! mountinfo -q /sys/firmware/efi/efivars; then
if grep -qs efivarfs /proc/filesystems; then if grep -qs efivarfs /proc/filesystems; then
ebegin "Mounting efivarfs filesystem" ebegin "Mounting efivarfs filesystem"
mount -n -t efivarfs -o ${sysfs_opts} \ mount -n -t efivarfs -o ${sysfs_opts} \