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/util/grub.d/10_linux.in (-3 / +13 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+="${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
  for i in intel-uc.img intel-ucode.img microcode.cpio; do
197
    if test -e "${dirname}/${i}" ; then
198
      initrd+=" ${i}"
199
      break
200
    fi
201
  done
192
  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
202
  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
193
	   "initrd-${version}" "initramfs-${version}.img" \
203
	   "initrd-${version}" "initramfs-${version}.img" \
194
	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
204
	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
Lines 198-204 while [ "x$list" != "x" ] ; do Link Here
198
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
208
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
199
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
209
	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
200
    if test -e "${dirname}/${i}" ; then
210
    if test -e "${dirname}/${i}" ; then
201
      initrd="$i"
211
      initrd+=" $i"
202
      break
212
      break
203
    fi
213
    fi
204
  done
214
  done
Lines 217-223 while [ "x$list" != "x" ] ; do Link Here
217
  fi
227
  fi
218
228
219
  if test -n "${initrd}" ; then
229
  if test -n "${initrd}" ; then
220
    gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
230
    gettext_printf "Found initrd image(s) in %s:%s\n" "${dirname}" "${initrd}" >&2
221
  elif test -z "${initramfs}" ; then
231
  elif test -z "${initramfs}" ; then
222
    # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
232
    # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
223
    # no initrd or builtin initramfs, it can't work here.
233
    # no initrd or builtin initramfs, it can't work here.

Return to bug 645088