From 8b4f54ef5ff00f81f3f699e1a900467ea2975e4ad5ba6089a01270977fef3918 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 15 Jul 2014 07:27:01 +0000 Subject: [PATCH] Accepting request 241015 from home:joeyli:branches:Base:System Removed efivars.conf because the kernel patch of autoload efivars driver accepted by linux-efi upstream (bnc#881559) OBS-URL: https://build.opensuse.org/request/show/241015 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=716 --- systemd-mini.changes | 8 ++++++++ systemd-mini.spec | 9 --------- systemd.changes | 8 ++++++++ systemd.spec | 9 --------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index dc195ec5..bec1e1f7 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 15 06:33:01 UTC 2014 - jlee@suse.com + +- Removed %{_libexecdir}/modules-load.d/efivars.conf because the kernel + patch of autoload efivars driver accepted by linux-efi upstream. + (bnc#881559) + https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=next&id=be756a5327fe3d4686d74d3e9b273010424e230c + ------------------------------------------------------------------- Mon Jul 14 14:53:21 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 218906f9..46efd2d1 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1576,12 +1576,6 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf # load sg module at boot time sg EOF -%if 0%{has_efi} -cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/efivars.conf -# load efivars module at boot time -efivars -EOF -%endif # To avoid making life hard for Factory developers, don't package the # kernel.core_pattern setting until systemd-coredump is a part of an actual @@ -2044,9 +2038,6 @@ exit 0 %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d %{_libexecdir}/modules-load.d/sg.conf -%if 0%{has_efi} -%{_libexecdir}/modules-load.d/efivars.conf -%endif %dir %{_libexecdir}/tmpfiles.d %dir %{_sysconfdir}/tmpfiles.d diff --git a/systemd.changes b/systemd.changes index dc195ec5..32b88f5e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 15 06:29:54 UTC 2014 - jlee@suse.com + +- Removed %{_libexecdir}/modules-load.d/efivars.conf because the kernel + patch of autoload efivars driver accepted by linux-efi upstream. + (bnc#881559) + https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=next&id=be756a5327fe3d4686d74d3e9b273010424e230c + ------------------------------------------------------------------- Mon Jul 14 14:53:21 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index c84d0714..71e8fb9f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1571,12 +1571,6 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf # load sg module at boot time sg EOF -%if 0%{has_efi} -cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/efivars.conf -# load efivars module at boot time -efivars -EOF -%endif # To avoid making life hard for Factory developers, don't package the # kernel.core_pattern setting until systemd-coredump is a part of an actual @@ -2039,9 +2033,6 @@ exit 0 %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d %{_libexecdir}/modules-load.d/sg.conf -%if 0%{has_efi} -%{_libexecdir}/modules-load.d/efivars.conf -%endif %dir %{_libexecdir}/tmpfiles.d %dir %{_sysconfdir}/tmpfiles.d