From e9e6f111555ce5a3f934f7e41a2367f979b48a8c Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 25 Jun 2012 19:32:22 +0200 Subject: [PATCH] * util/grub-install.in: Fix dvhtool invocation. Add arc to the list of platforms with firmware disk drivers in the core. --- ChangeLog | 5 +++++ util/grub-install.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb967fd37..56e5d3e8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-06-25 Vladimir Serbinenko + + * util/grub-install.in: Fix dvhtool invocation. Add arc to the list of + platforms with firmware disk drivers in the core. + 2012-06-25 Vladimir Serbinenko * grub-core/disk/diskfilter.c (scan_disk) [GRUB_UTIL]: Put more diff --git a/util/grub-install.in b/util/grub-install.in index 0697c47c5..e19f1cd94 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -340,7 +340,7 @@ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ] ; then if [ x$disk_module = xunspecified ]; then disk_module=biosdisk fi -elif [ "${grub_modinfo_platform}" = "ieee1275" ] || [ "${grub_modinfo_platform}" = "efi" ] ; then +elif [ "${grub_modinfo_platform}" = "ieee1275" ] || [ "${grub_modinfo_platform}" = "efi" ] || [ "${grub_modinfo_platform}" = "arc" ] ; then disk_module= else disk_module=native @@ -817,7 +817,7 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ] } fi elif [ x"${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = xmips-arc ]; then - dvhtool -d "${install_device}" --unix-to-vh "{grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" grub + dvhtool -d "${install_device}" --unix-to-vh "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" grub gettext "You will have to set \`SystemPartition' and \`OSLoader' manually." 1>&2 echo 1>&2 elif [ x"$grub_modinfo_platform" = xefi ]; then