summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Coval <philippe.coval@open.eurogiciel.org>2015-05-05 16:22:53 +0200
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>2015-05-28 14:49:11 +0200
commit8f10ce70b77418018fd1713c8fbaacd4d4ec2bde (patch)
treee012cf4892b20b466dc89ff3a9d47a9688f635ae
parent4654df1f9728c1b10134d2e478860a2ba5ded4c4 (diff)
downloadkernel-common-8f10ce70b77418018fd1713c8fbaacd4d4ec2bde.tar.gz
kernel-common-8f10ce70b77418018fd1713c8fbaacd4d4ec2bde.tar.bz2
kernel-common-8f10ce70b77418018fd1713c8fbaacd4d4ec2bde.zip
packaging: fix gummiboot missing args
Change-Id: I88b2d65fc2570e1585a9886d4e28d4f6443d5711 Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org> Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
-rw-r--r--packaging/linux-stable.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/packaging/linux-stable.spec b/packaging/linux-stable.spec
index 99934d274ec0..265a38306f8f 100644
--- a/packaging/linux-stable.spec
+++ b/packaging/linux-stable.spec
@@ -298,7 +298,10 @@ rm -rf %{buildroot}/usr/lib/debug/lib/traceevent/plugins/*.debug
%post -n kernel-%{variant}
if [ -f "/boot/loader/loader.conf" ]; then
# EFI boot with gummiboot
- INSTALLERFW_MOUNT_PREFIX="/" /usr/sbin/setup-scripts-gummiboot-conf
+ INSTALLERFW_MOUNT_PREFIX="/" /bin/sh /usr/sbin/setup-gummiboot-conf \
+ add -f \
+ "%{kernel_full_version}" "%{kernel_full_version}" "vmlinuz-%{kernel_full_version}" \
+ "$(cat /proc/cmdline)"
# "/etc/installerfw-environment" does not exist in MIC environment, when it
# builds the image. MIC will add boot-loader entries later using the
# 'setup-scripts-boot' script.
@@ -335,7 +338,8 @@ fi
%postun -n kernel-%{variant}
if [ -f "/boot/loader/loader.conf" ]; then
# EFI boot with gummiboot
- INSTALLERFW_MOUNT_PREFIX="/" /usr/sbin/setup-scripts-gummiboot-conf
+ INSTALLERFW_MOUNT_PREFIX="/" /bin/sh /usr/sbin/setup-gummiboot-conf \
+ remove "vmlinuz-%{kernel_full_version}"
if [ -f "/etc/installerfw-environment" ] && \
[ -x "/usr/sbin/setup-scripts-bootloader-conf" ]; then
/usr/sbin/setup-scripts-bootloader-conf remove -f vmlinuz-%{kernel_full_version}