[PATCH] systemd: mount the EFI variable filesystem

[PATCH] systemd: mount the EFI variable filesystem

[Lee, Chun-Yi]

Add efivarfs to the mount_table in mount-setup.c, so the EFI variable
filesystem will be mounted when systemd executed.

The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel.

Cc: Kay Sievers <kay-tD+1rO4QERM@public.gmane.org>
Cc: Lennart Poettering <lennart-mdGvqq1h2p+GdvJs77BJ7Q@public.gmane.org>
Cc: Mantas MikulÄ—nas <grawity-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Zbigniew Jędrzejewski-Szmek <zbyszek-wrcVdnn0TatmR6Xm/wNWPw@public.gmane.org>
Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Cc: Matthew Garrett <mjg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Lee, Chun-Yi <jlee-IBi9RG/b67k@public.gmane.org>
---
 src/core/kmod-setup.c  |    1 +
 src/core/mount-setup.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index cc2a2d9..14a4778 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -33,6 +33,7 @@
 static const char * const kmod_table[] = {
         "autofs4", "/sys/class/misc/autofs",
         "ipv6",    "/sys/module/ipv6",
+	"efivarfs", "/sys/firmware/efi/efivars",
         "unix",    "/proc/net/unix"
 };
 
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 0fd112f..8ce4ddc 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = {
         { "sysfs",    "/sys",                   "sysfs",    NULL,                MS_NOSUID|MS_NOEXEC|MS_NODEV,                true,  true  },
         { "devtmpfs", "/dev",                   "devtmpfs", "mode=755",          MS_NOSUID|MS_STRICTATIME,                    true,  true  },
         { "securityfs", "/sys/kernel/security", "securityfs", NULL,              MS_NOSUID|MS_NOEXEC|MS_NODEV,                false, false },
+	{ "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL,		 MS_NOSUID|MS_NOEXEC|MS_NODEV,                false, false },
         { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NODEV|MS_STRICTATIME,           true,  true  },
         { "devpts",   "/dev/pts",               "devpts",   "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC,          false, true  },
         { "tmpfs",    "/run",                   "tmpfs",    "mode=755",          MS_NOSUID|MS_NODEV|MS_STRICTATIME,           true,  true  },
-- 
1.6.0.2

Re: [PATCH] systemd: mount the EFI variable filesystem

[Lennart Poettering]

On Sat, 27.10.12 11:23, Lee, Chun-Yi (joeyli.kernel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org) wrote:

> Add efivarfs to the mount_table in mount-setup.c, so the EFI variable
> filesystem will be mounted when systemd executed.
> 
> The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel.

I can't really test this, but looks reasonably simple, and I assume this
has been tested, so I merged this.

Thanks!

Lennart

-- 
Lennart Poettering - Red Hat, Inc.

Re: [PATCH] systemd: mount the EFI variable filesystem

[joeyli]

於 日，2012-10-28 於 14:00 +0100，Lennart Poettering 提到：
> On Sat, 27.10.12 11:23, Lee, Chun-Yi (joeyli.kernel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org) wrote:
> 
> > Add efivarfs to the mount_table in mount-setup.c, so the EFI variable
> > filesystem will be mounted when systemd executed.
> > 
> > The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel.
> 
> I can't really test this, but looks reasonably simple, and I assume this
> has been tested, so I merged this.
> 
> Thanks!
> 
> Lennart
> 

I tested this patch on my UEFI notebook with latest EFI kernel git tree,
the efivarfs mounted normally after system boot and I can delete/add EFI
variable through /sys/firmware/efi/efivars.

Thanks for your review and merged.


Thanks a lot!
Joey Lee

Re: [PATCH] systemd: mount the EFI variable filesystem

[Colin Walters]

On Mon, 2012-10-29 at 10:21 +0800, joeyli wrote:

> I tested this patch on my UEFI notebook with latest EFI kernel git tree,
> the efivarfs mounted normally after system boot and I can delete/add EFI
> variable through /sys/firmware/efi/efivars.

This causes systemd to output a warning if the kernel doesn't have an
efivars module.  I suppose to do this kind of thing "right" we'd
have to conditionalize the module loads on available kernel version they
first appeared in?

(Yes, I frequently I boot bleeding edge systemd from git on older
kernels)

Re: [systemd-devel] [PATCH] systemd: mount the EFI variable filesystem

[Kay Sievers]

On Wed, Oct 31, 2012 at 2:04 PM, Colin Walters <walters-gPq2gbYjIk8dnm+yROfE0A@public.gmane.org> wrote:
> On Mon, 2012-10-29 at 10:21 +0800, joeyli wrote:
>
>> I tested this patch on my UEFI notebook with latest EFI kernel git tree,
>> the efivarfs mounted normally after system boot and I can delete/add EFI
>> variable through /sys/firmware/efi/efivars.
>
> This causes systemd to output a warning if the kernel doesn't have an
> efivars module.  I suppose to do this kind of thing "right" we'd
> have to conditionalize the module loads on available kernel version they
> first appeared in?

We should probably suppress the warning that the module cannot be
loaded. And then maybe make the mount conditional, depending on the
existence of the target directory.

This should make all that only trigger when the kernel module is
available or it is compiled-in (libkmod tells the same), and do
nothing on older kernel, kernels without the filesysystem, or
platforms without EFI.

We generally never want to depend on specific kernel versions, because
people are free to backport stuff to older kernel versions or free to
disable things in the kernel which are not absolutely required.

Kay

Re: [systemd-devel] [PATCH] systemd: mount the EFI variable filesystem

[Josh Boyer]

On Wed, Oct 31, 2012 at 9:13 AM, Kay Sievers <kay-tD+1rO4QERM@public.gmane.org> wrote:
> On Wed, Oct 31, 2012 at 2:04 PM, Colin Walters <walters-gPq2gbYjIk8dnm+yROfE0A@public.gmane.org> wrote:
>> On Mon, 2012-10-29 at 10:21 +0800, joeyli wrote:
>>
>>> I tested this patch on my UEFI notebook with latest EFI kernel git tree,
>>> the efivarfs mounted normally after system boot and I can delete/add EFI
>>> variable through /sys/firmware/efi/efivars.
>>
>> This causes systemd to output a warning if the kernel doesn't have an
>> efivars module.  I suppose to do this kind of thing "right" we'd
>> have to conditionalize the module loads on available kernel version they
>> first appeared in?
>
> We should probably suppress the warning that the module cannot be
> loaded. And then maybe make the mount conditional, depending on the
> existence of the target directory.
>
> This should make all that only trigger when the kernel module is
> available or it is compiled-in (libkmod tells the same), and do
> nothing on older kernel, kernels without the filesysystem, or
> platforms without EFI.

Yes to all of that.

For those wanting a distro kernel to play with that has this support,
we've included efivarfs in Fedora rawhide and soon in F18.

josh

[PATCH] systemd: mount the EFI variable filesystem

[Lee, Chun-Yi]

Add efivarfs to the mount_table in mount-setup.c, so the EFI variable
filesystem will be mounted when systemd executed.

The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel.

Cc: Kay Sievers <kay-tD+1rO4QERM@public.gmane.org>
Cc: Lennart Poettering <lennart-mdGvqq1h2p+GdvJs77BJ7Q@public.gmane.org>
Cc: Mantas MikulÄ—nas <grawity-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Zbigniew Jędrzejewski-Szmek <zbyszek-wrcVdnn0TatmR6Xm/wNWPw@public.gmane.org>
Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Cc: Matthew Garrett <mjg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Lee, Chun-Yi <jlee-IBi9RG/b67k@public.gmane.org>
---
 src/core/kmod-setup.c  |    1 +
 src/core/mount-setup.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index cc2a2d9..14a4778 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -33,6 +33,7 @@
 static const char * const kmod_table[] = {
         "autofs4", "/sys/class/misc/autofs",
         "ipv6",    "/sys/module/ipv6",
+	"efivarfs", "/sys/firmware/efi/efivars",
         "unix",    "/proc/net/unix"
 };
 
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 0fd112f..8ce4ddc 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = {
         { "sysfs",    "/sys",                   "sysfs",    NULL,                MS_NOSUID|MS_NOEXEC|MS_NODEV,                true,  true  },
         { "devtmpfs", "/dev",                   "devtmpfs", "mode=755",          MS_NOSUID|MS_STRICTATIME,                    true,  true  },
         { "securityfs", "/sys/kernel/security", "securityfs", NULL,              MS_NOSUID|MS_NOEXEC|MS_NODEV,                false, false },
+	{ "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL,		 MS_NOSUID|MS_NOEXEC|MS_NODEV,                false, false },
         { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NODEV|MS_STRICTATIME,           true,  true  },
         { "devpts",   "/dev/pts",               "devpts",   "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC,          false, true  },
         { "tmpfs",    "/run",                   "tmpfs",    "mode=755",          MS_NOSUID|MS_NODEV|MS_STRICTATIME,           true,  true  },
-- 
1.6.0.2

[PATCH] systemd: mount the EFI variable filesystem

[Lee, Chun-Yi]

Add efivarfs to the mount_table in mount-setup.c, so the EFI variable
filesystem will be mounted when systemd executed.

The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel.

Cc: Kay Sievers <kay-tD+1rO4QERM@public.gmane.org>
Cc: Lennart Poettering <lennart-mdGvqq1h2p+GdvJs77BJ7Q@public.gmane.org>
Cc: Mantas MikulÄ—nas <grawity-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Zbigniew Jędrzejewski-Szmek <zbyszek-wrcVdnn0TatmR6Xm/wNWPw@public.gmane.org>
Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Cc: Matthew Garrett <mjg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Lee, Chun-Yi <jlee-IBi9RG/b67k@public.gmane.org>
---
 src/core/kmod-setup.c  |    1 +
 src/core/mount-setup.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index cc2a2d9..14a4778 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -33,6 +33,7 @@
 static const char * const kmod_table[] = {
         "autofs4", "/sys/class/misc/autofs",
         "ipv6",    "/sys/module/ipv6",
+	"efivarfs", "/sys/firmware/efi/efivars",
         "unix",    "/proc/net/unix"
 };
 
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 0fd112f..8ce4ddc 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = {
         { "sysfs",    "/sys",                   "sysfs",    NULL,                MS_NOSUID|MS_NOEXEC|MS_NODEV,                true,  true  },
         { "devtmpfs", "/dev",                   "devtmpfs", "mode=755",          MS_NOSUID|MS_STRICTATIME,                    true,  true  },
         { "securityfs", "/sys/kernel/security", "securityfs", NULL,              MS_NOSUID|MS_NOEXEC|MS_NODEV,                false, false },
+	{ "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL,		 MS_NOSUID|MS_NOEXEC|MS_NODEV,                false, false },
         { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NODEV|MS_STRICTATIME,           true,  true  },
         { "devpts",   "/dev/pts",               "devpts",   "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC,          false, true  },
         { "tmpfs",    "/run",                   "tmpfs",    "mode=755",          MS_NOSUID|MS_NODEV|MS_STRICTATIME,           true,  true  },
-- 
1.6.0.2