I have made the following changes intended for : CE:Adaptation:x86-generic / grubby
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7788 Thank You, yunta [This message was auto-generated] --- Request # 7788: Messages from BOSS: State: review at 2013-02-01T00:51:38 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:yunta / grubby -> CE:Adaptation:x86-generic / grubby changes files: -------------- --- grubby.changes +++ grubby.changes @@ -0,0 +1,4 @@ +* Thu Jan 31 2013 Maciej Blomberg <[email protected]> - 7.0.8 +- Support "linux" keyword in extlinux.conf +- Fixes NEMO#179: Device doesn't boot after kernel update + new: ---- support_linux_keyword.patch spec files: ----------- --- grubby.spec +++ grubby.spec @@ -10,7 +10,7 @@ Summary: Command line tool for updating bootloader configs Version: 7.0.8 -Release: 1 +Release: 3 Group: System/Base License: GPLv2+ URL: http://git.fedorahosted.org/git/grubby.git @@ -21,6 +21,7 @@ Patch2: set-default-kernel.patch Patch3: symbolic-link-to-kernel.patch Patch4: grubby_add_kboot.patch +Patch5: support_linux_keyword.patch BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(popt) @@ -47,6 +48,8 @@ %patch3 -p1 # grubby_add_kboot.patch %patch4 -p1 +# support_linux_keyword.patch +%patch5 -p1 # >> setup # << setup other changes: -------------- ++++++ grubby.yaml --- grubby.yaml +++ grubby.yaml @@ -1,7 +1,7 @@ Name: grubby Summary: Command line tool for updating bootloader configs Version: 7.0.8 -Release: 1 +Release: 3 Group: System/Base License: GPLv2+ URL: http://git.fedorahosted.org/git/grubby.git @@ -13,6 +13,7 @@ - set-default-kernel.patch - symbolic-link-to-kernel.patch - grubby_add_kboot.patch + - support_linux_keyword.patch Description: | grubby is a command line tool for updating and displaying information about the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) ++++++ more-support-code-for-syslinux.patch --- more-support-code-for-syslinux.patch +++ more-support-code-for-syslinux.patch @@ -125,7 +125,7 @@ + --copy-default $makedefault --title $version \ + ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \ + --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$version" \ -+ --$syslinuxFlag ++ --$syslinuxFlag --bad-image-okay + + #Change menu label + sed -i "s/^default .*$/default vesamenu.c32/" /boot/extlinux/extlinux.conf @@ -133,7 +133,7 @@ + lineno=$(sed -n "/vmlinuz-${version}/=" /boot/extlinux/extlinux.conf) + if [ -n "$lineno" ] ; then + lineno=$((lineno-1)) -+ sed -i "${lineno} s/menu label.*$/menu label Moblin (${version})/; s/\/vmlinuz/vmlinuz/" /boot/extlinux/extlinux.conf ++ sed -i "${lineno} s/menu label.*$/menu label Moblin (${version})/" /boot/extlinux/extlinux.conf + cp -f $bootPrefix/$kernelName-$version /boot/extlinux/ + fi + ++++++ set-default-kernel.patch --- set-default-kernel.patch +++ set-default-kernel.patch @@ -45,8 +45,8 @@ lineno=$(sed -n "/vmlinuz-${version}/=" /boot/extlinux/extlinux.conf) if [ -n "$lineno" ] ; then lineno=$((lineno-1)) -- sed -i "${lineno} s/menu label.*$/menu label Moblin (${version})/; s/\/vmlinuz/vmlinuz/" /boot/extlinux/extlinux.conf -+ sed -i "${lineno} s/menu label.*$/menu label MeeGo (${version})/; s/\/vmlinuz/vmlinuz/" /boot/extlinux/extlinux.conf +- sed -i "${lineno} s/menu label.*$/menu label Moblin (${version})/" /boot/extlinux/extlinux.conf ++ sed -i "${lineno} s/menu label.*$/menu label MeeGo (${version})/" /boot/extlinux/extlinux.conf cp -f $bootPrefix/$kernelName-$version /boot/extlinux/ fi ++++++ support_linux_keyword.patch (new) --- support_linux_keyword.patch +++ support_linux_keyword.patch @@ -0,0 +1,10 @@ +--- grubby-7.0.8-old/grubby.c 2013-01-31 23:33:33.260110273 +0200 ++++ grubby-7.0.8-new/grubby.c 2009-10-01 11:10:28.000000000 +0300 +@@ -242,6 +242,7 @@ + { "root", LT_ROOT, ' ' }, + { "default", LT_DEFAULT, ' ' }, + { "kernel", LT_KERNEL, ' ' }, ++ { "linux", LT_KERNEL, ' ' }, + { "initrd", LT_INITRD, ' ', ',' }, + { "append", LT_KERNELARGS, ' ' }, + { "prompt", LT_UNKNOWN, ' ' }, ++++++ symbolic-link-to-kernel.patch --- symbolic-link-to-kernel.patch +++ symbolic-link-to-kernel.patch @@ -10,7 +10,7 @@ + lineno=$(sed -n "/vmlinuz-${version}/=;/vmlinuz-${version}/q" /boot/extlinux/extlinux.conf) if [ -n "$lineno" ] ; then lineno=$((lineno-1)) - sed -i "${lineno} s/menu label.*$/menu label MeeGo (${version})/; s/\/vmlinuz/vmlinuz/" /boot/extlinux/extlinux.conf + sed -i "${lineno} s/menu label.*$/menu label MeeGo (${version})/" /boot/extlinux/extlinux.conf - cp -f $bootPrefix/$kernelName-$version /boot/extlinux/ + ln -sf ../$kernelName-$version /boot/extlinux/$kernelName-$version fi
