spacepaste

  1.  
  2. --- 10_linux.in 2017-04-24 11:15:50.000000000 +0200
  3. +++ 10_linux.in.new 2017-05-11 14:35:36.737981775 +0200
  4. @@ -67,6 +67,12 @@
  5. ;;
  6. esac
  7. +intel_ucode=
  8. +if test -e "/boot/early-ucode.cpio"; then
  9. + gettext_printf "Found Intel microcode image\n" >&2
  10. + intel_ucode="$(make_system_path_relative_to_its_root /boot/early-ucode.cpio)"
  11. +fi
  12. +
  13. title_correction_code=
  14. linux_entry ()
  15. @@ -95,7 +101,7 @@
  16. echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
  17. else
  18. echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
  19. - fi
  20. + fi
  21. if [ x$type != xrecovery ] ; then
  22. save_default_entry | grub_add_tab
  23. fi
  24. @@ -138,7 +144,15 @@
  25. message="$(gettext_printf "Loading initial ramdisk ...")"
  26. sed "s/^/$submenu_indentation/" << EOF
  27. echo '$(echo "$message" | grub_quote)'
  28. - initrd ${rel_dirname}/${initrd}
  29. + initrd ${intel_ucode} ${rel_dirname}/${initrd}
  30. +EOF
  31. + fi
  32. +
  33. + if test -n "${intel_ucode}" ; then
  34. + message="$(gettext_printf "Loading Intel microcode image ...")"
  35. + sed "s/^/$submenu_indentation/" << EOF
  36. + echo '$message'
  37. + initrd ${intel_ucode}
  38. EOF
  39. fi
  40. sed "s/^/$submenu_indentation/" << EOF
  41. @@ -153,7 +167,7 @@
  42. for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
  43. if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
  44. done ;;
  45. - *)
  46. + *)
  47. list=
  48. for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
  49. if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
  50. @@ -229,7 +243,7 @@
  51. "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
  52. submenu_indentation="$grub_tab"
  53. -
  54. +
  55. if [ -z "$boot_device_id" ]; then
  56. boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
  57. fi
  58.