From 4b90fcc13bbea90ed782e7f9338a18c67e0703b2 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 28 May 2013 11:12:08 +0200 Subject: [PATCH] systemd-204-4 - Fix kernel-install (#965897) --- kernel-install-grubby.patch | 11 ++++++----- systemd.spec | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kernel-install-grubby.patch b/kernel-install-grubby.patch index 94f5f5f..57df209 100644 --- a/kernel-install-grubby.patch +++ b/kernel-install-grubby.patch @@ -1,24 +1,25 @@ -From b3fdcc4f9a1331950f462e6bf43daa718a59dfe5 Mon Sep 17 00:00:00 2001 +From e42573cfbcd3f47c6485d9b437b3e87c95662dbd Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 13 Mar 2013 07:57:53 +0100 Subject: [PATCH] kernel-install: add fedora specific callouts to new-kernel-pkg --- - src/kernel-install/kernel-install | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + src/kernel-install/kernel-install | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install -index fb2ee57..1b73def 100644 +index fb2ee57..f576dfe 100644 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install -@@ -19,6 +19,25 @@ +@@ -19,6 +19,26 @@ # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see . +if [[ -x /sbin/new-kernel-pkg ]]; then + case "$1" in + add) ++ /sbin/new-kernel-pkg --package kernel --install "$2" || exit $? + /sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --update "$2" || exit $? + /sbin/new-kernel-pkg --package kernel --rpmposttrans "$2" || exit $? + ;; diff --git a/systemd.spec b/systemd.spec index d1edb20..bf9500a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -13,7 +13,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 204 -Release: 3%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 4%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -754,6 +754,9 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue May 28 2013 Harald Hoyer 204-4 +- Fix kernel-install (#965897) + * Wed May 22 2013 Kay Sievers - 204-3 - Fix kernel-install (#965897)