Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 645088 | Differences between
and this patch

Collapse All | Expand All

(-)a/docs/grub.texi (+6 lines)
Lines 1398-1403 for all respectively normal entries. Link Here
1398
The values of these options replace the values of @samp{GRUB_CMDLINE_LINUX}
1398
The values of these options replace the values of @samp{GRUB_CMDLINE_LINUX}
1399
and @samp{GRUB_CMDLINE_LINUX_DEFAULT} for Linux and Xen menu entries.
1399
and @samp{GRUB_CMDLINE_LINUX_DEFAULT} for Linux and Xen menu entries.
1400
1400
1401
@item GRUB_CUSTOM_INITRD_EARLY_INCLUDES
1402
List of space-separated early initrd images to be loaded from @samp{/boot}.
1403
This is for loading things like microcode, firmware, ACPI tables, and so on.
1404
They will be loaded after standard processor microcode images but before an
1405
actual kernel initrd image.
1406
1401
@item GRUB_DISABLE_LINUX_UUID
1407
@item GRUB_DISABLE_LINUX_UUID
1402
Normally, @command{grub-mkconfig} will generate menu entries that use
1408
Normally, @command{grub-mkconfig} will generate menu entries that use
1403
universally-unique identifiers (UUIDs) to identify the root filesystem to
1409
universally-unique identifiers (UUIDs) to identify the root filesystem to
(-)a/util/grub-mkconfig.in (+1 lines)
Lines 211-216 export GRUB_DEFAULT \ Link Here
211
  GRUB_CMDLINE_NETBSD \
211
  GRUB_CMDLINE_NETBSD \
212
  GRUB_CMDLINE_NETBSD_DEFAULT \
212
  GRUB_CMDLINE_NETBSD_DEFAULT \
213
  GRUB_CMDLINE_GNUMACH \
213
  GRUB_CMDLINE_GNUMACH \
214
  GRUB_CUSTOM_INITRD_EARLY_INCLUDES \
214
  GRUB_TERMINAL_INPUT \
215
  GRUB_TERMINAL_INPUT \
215
  GRUB_TERMINAL_OUTPUT \
216
  GRUB_TERMINAL_OUTPUT \
216
  GRUB_SERIAL_COMMAND \
217
  GRUB_SERIAL_COMMAND \
(-)a/util/grub.d/10_linux.in (-4 / +26 lines)
Lines 136-144 EOF Link Here
136
  if test -n "${initrd}" ; then
136
  if test -n "${initrd}" ; then
137
    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
137
    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
138
    message="$(gettext_printf "Loading initial ramdisk ...")"
138
    message="$(gettext_printf "Loading initial ramdisk ...")"
139
    initrd_path=
140
    for i in ${initrd}; do
141
      initrd_path="${initrd_path} ${rel_dirname}/${i}"
142
    done
139
    sed "s/^/$submenu_indentation/" << EOF
143
    sed "s/^/$submenu_indentation/" << EOF
140
	echo	'$(echo "$message" | grub_quote)'
144
	echo	'$(echo "$message" | grub_quote)'
141
	initrd	${rel_dirname}/${initrd}
145
	initrd	$(echo $initrd_path)
142
EOF
146
EOF
143
  fi
147
  fi
144
  sed "s/^/$submenu_indentation/" << EOF
148
  sed "s/^/$submenu_indentation/" << EOF
Lines 189-194 while [ "x$list" != "x" ] ; do Link Here
189
  linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
193
  linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
190
194
191
  initrd=
195
  initrd=
196
  # Search for early initrd images applicable to all kernels.
197
  for i in intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img \
198
	   early_ucode.cpio microcode.cpio \
199
	   ${GRUB_CUSTOM_INITRD_EARLY_INCLUDES}; do
200
    if test -e "${dirname}/${i}" ; then
201
      initrd="${initrd} ${i}"
202
    fi
203
  done
204
205
  initrd_kernel=
206
  # Search for a kernel initrd image.
192
  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
207
  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
193
	   "initrd-${version}" "initramfs-${version}.img" \
208
	   "initrd-${version}" "initramfs-${version}.img" \
194
	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
209
	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
Lines 198-204 while [ "x$list" != "x" ] ; do Link Here
198
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
213
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
199
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
214
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
200
    if test -e "${dirname}/${i}" ; then
215
    if test -e "${dirname}/${i}" ; then
201
      initrd="$i"
216
      initrd="${initrd} ${i}"
217
      initrd_kernel="${i}"
202
      break
218
      break
203
    fi
219
    fi
204
  done
220
  done
Lines 217-224 while [ "x$list" != "x" ] ; do Link Here
217
  fi
233
  fi
218
234
219
  if test -n "${initrd}" ; then
235
  if test -n "${initrd}" ; then
220
    gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
236
    initrd_display=
221
  elif test -z "${initramfs}" ; then
237
    for i in ${initrd}; do
238
      initrd_display="${initrd_display} ${dirname}/${i}"
239
    done
240
    gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
241
  fi
242
243
  if test -z "${initramfs}" && test -z "${initrd_kernel}" ; then
222
    # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
244
    # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
223
    # no initrd or builtin initramfs, it can't work here.
245
    # no initrd or builtin initramfs, it can't work here.
224
    linux_root_device_thisversion=${GRUB_DEVICE}
246
    linux_root_device_thisversion=${GRUB_DEVICE}

Return to bug 645088