6219127445
* commands/search.c (options): Add --fs_uuid option.
(search_fs_uuid): New function.
(grub_cmd_search): Fix --set argument passing.
Use search_fs_uuid() when requested via --fs_uuid.
(grub_search_init): Update help message.
* fs/ext2.c (struct grub_ext2_sblock): Rename `unique_id' to `uuid'
and redeclare it as an array of 16-bit words.
(grub_ext2_uuid): New function.
(grub_ext2_fs): Reference grub_ext2_uuid() in `uuid' struct member.
* include/grub/fs.h (struct grub_fs): Add `uuid' struct member.
* util/update-grub.in (GRUB_DEVICE_UUID, GRUB_DEVICE_BOOT)
(GRUB_DEVICE_BOOT_UUID): New variables.
(GRUB_DRIVE. GRUB_DRIVE_BOOT. GRUB_DRIVE_BOOT_GRUB): Remove.
* util/grub.d/00_header.in: Set root using `search --fs_uuid' command
whenever possible.
* util/grub.d/10_hurd.in: Avoid explicit use of root drive. Instead,
just assume `root' variable has the right value.
* util/grub.d/10_linux.in: Likewise.
* util/grub-probe.c (probe): Probe for filesystem UUID when requested
via PRINT_FS_UUID.
(main): Recognise `-t fs_uuid' argument.
70 lines
2 KiB
Bash
70 lines
2 KiB
Bash
#! /bin/sh -e
|
|
|
|
# update-grub helper script.
|
|
# Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
|
|
#
|
|
# GRUB is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# GRUB is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
prefix=@prefix@
|
|
exec_prefix=@exec_prefix@
|
|
libdir=@libdir@
|
|
platform=@platform@
|
|
|
|
# for convert_system_path_to_grub_path()
|
|
. ${libdir}/grub/update-grub_lib
|
|
|
|
# Do this as early as possible, since other commands might depend on it.
|
|
# (e.g. the `font' command might need lvm or raid modules)
|
|
for i in ${GRUB_PRELOAD_MODULES} ; do
|
|
echo "insmod $i"
|
|
done
|
|
|
|
if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi
|
|
if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
|
|
|
|
cat << EOF
|
|
set default=${GRUB_DEFAULT}
|
|
set timeout=${GRUB_TIMEOUT}
|
|
EOF
|
|
|
|
# If there's a filesystem UUID that GRUB is capable of identifiing, use it;
|
|
# otherwise set root as per value in device.map.
|
|
if [ "x${GRUB_DEVICE_BOOT_UUID}" = "x" ] ; then
|
|
echo "set root=`grub-probe --device ${GRUB_DEVICE_BOOT} --target=drive`"
|
|
else
|
|
echo "search --fs_uuid ${GRUB_DEVICE_BOOT_UUID} --set"
|
|
fi
|
|
|
|
case ${platform}:${GRUB_TERMINAL} in
|
|
pc:gfxterm) cat << EOF
|
|
if font ${GRUB_FONT_PATH} ; then
|
|
set gfxmode=640x480
|
|
insmod gfxterm
|
|
insmod vbe
|
|
terminal gfxterm
|
|
fi
|
|
EOF
|
|
;;
|
|
*:serial)
|
|
if [ "x${GRUB_SERIAL_COMMAND}" = "x" ] ; then
|
|
echo "Warning, requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used." >&2
|
|
GRUB_SERIAL_COMMAND=serial
|
|
fi
|
|
echo "${GRUB_SERIAL_COMMAND}"
|
|
echo "terminal serial"
|
|
;;
|
|
*:*)
|
|
echo "terminal ${GRUB_TERMINAL}"
|
|
;;
|
|
esac
|