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

Revert "kernel-install-grubby.patch: only copy files to /boot on "add""

Browse Source 
The fix is worse than the bug it tries to fix

This reverts commit 908de082ce.
This commit is contained in:
Dennis Gilmore 2016-02-16 16:29:38 -06:00
parent 5a1e61f28b
commit 4ee6493f72
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kernel-install-grubby.patch
View File

@ -1,29 +1,26 @@
From 019766177baf70d5a4f688adb768b07f28fd90a9 Mon Sep 17 00:00:00 2001 From 860be9427dff48efc5e486b039be932094572047 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com> From: Harald Hoyer <harald@redhat.com>
Date: Tue, 14 Jan 2014 17:48:08 -0500 Date: Tue, 14 Jan 2014 17:48:08 -0500
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 | 47 +++++++++++++++++++++++++++++++++++++++ src/kernel-install/kernel-install | 44 +++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+) 1 file changed, 44 insertions(+)
mode change 100644 => 100755 src/kernel-install/kernel-install mode change 100644 => 100755 src/kernel-install/kernel-install
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
old mode 100644 old mode 100644
new mode 100755 new mode 100755
index 3ae1d77..041f526 index 3ae1d77..5c1e4fc
--- a/src/kernel-install/kernel-install --- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install
@@ -71,6 +71,53 @@ fi @@ -71,6 +71,50 @@ fi
KERNEL_VERSION="$1" KERNEL_VERSION="$1"
KERNEL_IMAGE="$2" KERNEL_IMAGE="$2"
+if [[ -x /sbin/new-kernel-pkg ]]; then +if [[ -x /sbin/new-kernel-pkg ]]; then
+ KERNEL_DIR="${KERNEL_IMAGE%/*}" + KERNEL_DIR="${KERNEL_IMAGE%/*}"
+ [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
+ case "$COMMAND" in
+ add)
+ if [[ "${KERNEL_DIR}" != "/boot" ]]; then + if [[ "${KERNEL_DIR}" != "/boot" ]]; then
+ for i in \ + for i in \
+ "$KERNEL_IMAGE" \ + "$KERNEL_IMAGE" \
@ -33,13 +30,9 @@ index 3ae1d77..041f526
+ "$KERNEL_DIR"/dtb \ + "$KERNEL_DIR"/dtb \
+ ; do + ; do
+ [[ -e "$i" ]] || continue + [[ -e "$i" ]] || continue
+ if [ -d "$i" ]; then
+ cp -a "$i" -t "/boot/${i##*/}-${KERNEL_VERSION}"
+ else
+ cp -a "$i" "/boot/${i##*/}-${KERNEL_VERSION}" + cp -a "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
+ fi
+ command -v restorecon &>/dev/null && \ + command -v restorecon &>/dev/null && \
+ restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}" + restorecon "/boot/${i##*/}-${KERNEL_VERSION}"
+ done + done
+ # hmac is .vmlinuz-<version>.hmac so needs a special treatment + # hmac is .vmlinuz-<version>.hmac so needs a special treatment
+ i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac" + i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
@ -49,6 +42,10 @@ index 3ae1d77..041f526
+ restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac" + restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
+ fi + fi
+ fi + fi
+
+ [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
+ case "$COMMAND" in
+ add)
+ /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $? + /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $?
+ /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $? + /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $?
+ /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $? + /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $?
@ -70,5 +67,5 @@ index 3ae1d77..041f526
read MACHINE_ID < /etc/machine-id read MACHINE_ID < /etc/machine-id
fi fi
-- --
2.7.0 2.6.0