rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

systemd-206-6

Browse Source 
- kernel-install now understands kernel flavors like PAE
This commit is contained in:
Harald Hoyer 2013-08-22 09:38:25 +02:00
parent b46f6bf09f
commit c3aabf43d0
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel-install-grubby.patch
View File

@ -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 <harald@redhat.com> From: Harald Hoyer <harald@redhat.com>
Date: Wed, 13 Mar 2013 07:57:53 +0100 Date: Wed, 13 Mar 2013 07:57:53 +0100
Subject: [PATCH] kernel-install: add fedora specific callouts to Subject: [PATCH] kernel-install: add fedora specific callouts to
new-kernel-pkg new-kernel-pkg
--- ---
src/kernel-install/kernel-install | 20 ++++++++++++++++++++ src/kernel-install/kernel-install | 21 +++++++++++++++++++++
1 file changed, 20 insertions(+) 1 file changed, 21 insertions(+)
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install 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 --- a/src/kernel-install/kernel-install
+++ b/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 # You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>. # along with systemd; If not, see <http://www.gnu.org/licenses/>.
+if [[ -x /sbin/new-kernel-pkg ]]; then +if [[ -x /sbin/new-kernel-pkg ]]; then
+ [[ "$2" == *\+* ]] && flavor=-"${2##*+}"
+ case "$1" in + case "$1" in
+ add) + add)
+ /sbin/new-kernel-pkg --package kernel --install "$2" || exit $? + /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$2" || exit $?
+ /sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --update "$2" || exit $? + /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$2" || exit $?
+ /sbin/new-kernel-pkg --package kernel --rpmposttrans "$2" || exit $? + /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$2" || exit $?
+ ;; + ;;
+ remove) + 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 echo "Usage:" >&2
-- --
1.8.2.1 1.8.3.1

5
systemd.spec
View File

@ -16,7 +16,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 206 Version: 206
Release: 5%{?gitcommit:.git%{gitcommit}}%{?dist} Release: 6%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager 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 %{_datadir}/systemd/gatewayd
%changelog %changelog
* Thu Aug 22 2013 Harald Hoyer <harald@redhat.com> 206-6
- kernel-install now understands kernel flavors like PAE
* Tue Aug 20 2013 Rex Dieter <rdieter@fedoraproject.org> - 206-5 * Tue Aug 20 2013 Rex Dieter <rdieter@fedoraproject.org> - 206-5
- add sddm.service to preset file (#998978) - add sddm.service to preset file (#998978)