[xorg-x11-drv-nvidia/el7] Update the triggerin to insert the new cmdline

commit 6d4f02b3dd97e49512485ce3c28515575a1aab01 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Tue May 30 16:35:44 2017 +0200 Update the triggerin to insert the new cmdline xorg-x11-drv-nvidia.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) --- diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 2833e97..a1d67dd 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -31,7 +31,7 @@ Name: xorg-x11-drv-nvidia Epoch: 2 Version: 375.66 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -393,7 +393,21 @@ if [ "$1" -eq "1" ]; then fi || : %if 0%{?fedora} || 0%{?rhel} >= 7 -%triggerin -- xorg-x11-drv-nvidia < 2:375.66-1 +%triggerin -- xorg-x11-drv-nvidia < 2:375.66-4 +if [ -f %{_sysconfdir}/default/grub ] ; then + . %{_sysconfdir}/default/grub + if [ -z "${GRUB_CMDLINE_LINUX+x}" ]; then + echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub + else + for i in %{_dracutopts} ; do + _has_string=$(echo ${GRUB_CMDLINE_LINUX} | fgrep -c $i) + if [ x"$_has_string" = x0 ] ; then + GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} ${i}" + fi + done + sed -i -e "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"${GRUB_CMDLINE_LINUX}\"/g" %{_sysconfdir}/default/grub + fi +fi %{_grubby} --args='%{_dracutopts}' &>/dev/null || : %endif @@ -570,6 +584,9 @@ fi ||: %{_libdir}/libnvidia-encode.so %changelog +* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2:375.66-4 +- Update the triggerin to insert the new cmdline + * Tue May 30 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2:375.66-3 - Revert 10_nvidia.json rename