vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Implement --bootloader-id

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-11 16:37:00 +02:00
parent f637773235
commit 638f5f7ea1
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
util/grub-install.in
View file

@ -61,6 +61,16 @@ efibootmgr=`which efibootmgr 2>/dev/null || true`
removable=no removable=no
efi_quiet= efi_quiet=
# Get GRUB_DISTRIBUTOR.
if test -f ${sysconfdir}/default/grub ; then
. ${sysconfdir}/default/grub
fi
bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr '[A-Z]' '[a-z]' | cut -d' ' -f1)"
if test -z "$bootloader_id"; then
bootloader_id=grub
fi
if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
disk_module=biosdisk disk_module=biosdisk
elif [ "${platform}" = "ieee1275" ] || [ "${platform}" = "efi" ] ; then elif [ "${platform}" = "ieee1275" ] || [ "${platform}" = "efi" ] ; then
@ -111,6 +121,7 @@ fi
if [ "${platform}" = "efi" ]; then if [ "${platform}" = "efi" ]; then
cat <<EOF cat <<EOF
--removable the installation device is removable --removable the installation device is removable
--bootloader-id=ID the ID of bootloader.
EOF EOF
fi fi
cat <<EOF cat <<EOF
@ -173,6 +184,11 @@ do
--grub-setup=*) --grub-setup=*)
grub_setup=`echo "$option" | sed 's/--grub-setup=//'` ;; grub_setup=`echo "$option" | sed 's/--grub-setup=//'` ;;
--bootloader-id)
bootloader_id=`argument $option "$@"`; shift;;
--bootloader_id=*)
bootloader_id=`echo "$option" | sed 's/--bootloader_id=//'` ;;
--grub-mkimage) --grub-mkimage)
grub_mkimage=`argument $option "$@"`; shift;; grub_mkimage=`argument $option "$@"`; shift;;
--grub-mkimage=*) --grub-mkimage=*)
@ -302,11 +318,6 @@ else
fi fi
if [ x"$platform" = xefi ]; then if [ x"$platform" = xefi ]; then
# Get GRUB_DISTRIBUTOR.
if test -f ${sysconfdir}/default/grub ; then
. ${sysconfdir}/default/grub
fi
# Find the EFI System Partition. # Find the EFI System Partition.
efidir= efidir=
if test -d ${bootdir}/efi; then if test -d ${bootdir}/efi; then
@ -339,6 +350,7 @@ if [ x"$platform" = xefi ]; then
# subdirectories below EFI. Vendors are expected to pick names that do # subdirectories below EFI. Vendors are expected to pick names that do
# not collide with other vendors. To minimise collisions, we use the # not collide with other vendors. To minimise collisions, we use the
# name of our distributor if possible. # name of our distributor if possible.
efi_distributor="$bootloader_id"
if test $removable = yes; then if test $removable = yes; then
# The specification makes stricter requirements of removable # The specification makes stricter requirements of removable
# devices, in order that only one image can be automatically loaded # devices, in order that only one image can be automatically loaded
@ -357,10 +369,6 @@ if [ x"$platform" = xefi ]; then
efi_file=BOOTIA64.EFI ;; efi_file=BOOTIA64.EFI ;;
esac esac
else else
efi_distributor="$(echo "$GRUB_DISTRIBUTOR" | tr '[A-Z]' '[a-z]' | cut -d' ' -f1)"
if test -z "$efi_distributor"; then
efi_distributor=grub
fi
# It is convenient for each architecture to have a different # It is convenient for each architecture to have a different
# efi_file, so that different versions can be installed in parallel. # efi_file, so that different versions can be installed in parallel.
case "$target_cpu" in case "$target_cpu" in