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 (+5 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_INCLUDES
1402
List of space-separated custom initrd images to be loaded from @samp{/boot}.
1403
They will be loaded after a processor microcode image but before a kernel
1404
specific image.
1405
1401
@item GRUB_DISABLE_LINUX_UUID
1406
@item GRUB_DISABLE_LINUX_UUID
1402
Normally, @command{grub-mkconfig} will generate menu entries that use
1407
Normally, @command{grub-mkconfig} will generate menu entries that use
1403
universally-unique identifiers (UUIDs) to identify the root filesystem to
1408
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_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 (-3 / +22 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 processor microcode initrd images. Use the first found.
197
  for i in intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img \
198
	   early-uc.cpio early-ucode.cpio microcode.cpio; do
199
    if test -e "${dirname}/${i}" ; then
200
      initrd="${initrd} ${i}"
201
      break
202
    fi
203
  done
204
  # Include user defined initrd images.
205
  for i in ${GRUB_CUSTOM_INITRD_INCLUDES}; do
206
    if test -e "${dirname}/${i}" ; then
207
      initrd="${initrd} ${i}"
208
    fi
209
  done
210
  # Search for kernel specific initrd images. Use the first found.
192
  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
211
  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
193
	   "initrd-${version}" "initramfs-${version}.img" \
212
	   "initrd-${version}" "initramfs-${version}.img" \
194
	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
213
	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
Lines 198-204 while [ "x$list" != "x" ] ; do Link Here
198
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
217
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
199
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
218
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
200
    if test -e "${dirname}/${i}" ; then
219
    if test -e "${dirname}/${i}" ; then
201
      initrd="$i"
220
      initrd="${initrd} ${i}"
202
      break
221
      break
203
    fi
222
    fi
204
  done
223
  done
Lines 217-223 while [ "x$list" != "x" ] ; do Link Here
217
  fi
236
  fi
218
237
219
  if test -n "${initrd}" ; then
238
  if test -n "${initrd}" ; then
220
    gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
239
    gettext_printf "Found initrd image(s) in %s:%s\n" "${dirname}" "${initrd}" >&2
221
  elif test -z "${initramfs}" ; then
240
  elif test -z "${initramfs}" ; then
222
    # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
241
    # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
223
    # no initrd or builtin initramfs, it can't work here.
242
    # no initrd or builtin initramfs, it can't work here.

Return to bug 645088