diff --git a/kernel-install-grubby.patch b/kernel-install-grubby.patch index 38505d9..b317ef9 100644 --- a/kernel-install-grubby.patch +++ b/kernel-install-grubby.patch @@ -1,4 +1,4 @@ -From 5150a366a4771a2a498d4e062482728d1dce94dd Mon Sep 17 00:00:00 2001 +From b3fdcc4f9a1331950f462e6bf43daa718a59dfe5 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 @@ -9,21 +9,21 @@ Subject: [PATCH] kernel-install: add fedora specific callouts to 1 file changed, 19 insertions(+) diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install -index 16c06e0..cf9829e 100644 +index fb2ee57..1b73def 100644 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install -@@ -25,6 +25,25 @@ COMMAND="$1" - KERNEL_VERSION="$2" - KERNEL_IMAGE="$3" +@@ -19,6 +19,25 @@ + # 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 "$COMMAND" in ++ case "$1" in + add) -+ /sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --install "$KERNEL_VERSION" || exit $? -+ /sbin/new-kernel-pkg --package kernel --rpmposttrans "$KERNEL_VERSION" || exit $? ++ /sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --install "$2" || exit $? ++ /sbin/new-kernel-pkg --package kernel --rpmposttrans "$2" || exit $? + ;; + remove) -+ /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove "$KERNEL_VERSION" || exit $? ++ /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove "$2" || exit $? + ;; + *) + ;; @@ -35,9 +35,9 @@ index 16c06e0..cf9829e 100644 + fi +fi + - [[ -f /etc/os-release ]] && . /etc/os-release - if ! [[ $ID ]]; then - echo "Can't determine the name of your distribution. Please create /etc/os-release." >&2 + usage() + { + echo "Usage:" >&2 -- -1.8.1 +1.8.2.1 diff --git a/systemd.spec b/systemd.spec index 48632be..8803458 100644 --- a/systemd.spec +++ b/systemd.spec @@ -13,7 +13,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 203 -Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -35,7 +35,7 @@ Source4: listen.conf Source6: yum-protect-systemd.conf # kernel-install patch for grubby, drop if grubby is obsolete -# Patch1000: kernel-install-grubby.patch +Patch1000: kernel-install-grubby.patch %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} @@ -753,6 +753,9 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue May 07 2013 Harald Hoyer 203-2 +- forward port kernel-install-grubby.patch + * Tue May 7 2013 Lennart Poettering - 203-1 - New upstream release