From c3aabf43d062b160c848671df804557f3a28b058 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Aug 22 2013 07:38:25 +0000 Subject: systemd-206-6 - kernel-install now understands kernel flavors like PAE --- diff --git a/kernel-install-grubby.patch b/kernel-install-grubby.patch index 57df209..717c484 100644 --- a/kernel-install-grubby.patch +++ b/kernel-install-grubby.patch @@ -1,30 +1,31 @@ -From e42573cfbcd3f47c6485d9b437b3e87c95662dbd Mon Sep 17 00:00:00 2001 +From dd33348393551411885397ff7d88a3a908eeb018 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 | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) + src/kernel-install/kernel-install | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install -index fb2ee57..f576dfe 100644 +index fb2ee57..31e988a 100644 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install -@@ -19,6 +19,26 @@ +@@ -19,6 +19,27 @@ # 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 ++ [[ "$2" == *\+* ]] && flavor=-"${2##*+}" + 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 $? ++ /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$2" || exit $? ++ /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$2" || exit $? ++ /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$2" || exit $? + ;; + remove) -+ /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove "$2" || exit $? ++ /sbin/new-kernel-pkg --package "kernel${flavor+-$flavor}" --rminitrd --rmmoddep --remove "$2" || exit $? + ;; + *) + ;; @@ -40,5 +41,5 @@ index fb2ee57..f576dfe 100644 { echo "Usage:" >&2 -- -1.8.2.1 +1.8.3.1 diff --git a/systemd.spec b/systemd.spec index eabec4c..f59206b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,7 +16,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 206 -Release: 5%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 6%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -625,6 +625,9 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g %{_datadir}/systemd/gatewayd %changelog +* Thu Aug 22 2013 Harald Hoyer 206-6 +- kernel-install now understands kernel flavors like PAE + * Tue Aug 20 2013 Rex Dieter - 206-5 - add sddm.service to preset file (#998978)