update grub-2.00-Dont-set-boot-on-ppc.patch to beta6
This commit is contained in:
parent
4ae29c92c0
commit
fa2c25cfff
@ -14,7 +14,7 @@ index 293b756..2503aa0 100644
|
|||||||
--- a/util/grub-install.in
|
--- a/util/grub-install.in
|
||||||
+++ b/util/grub-install.in
|
+++ b/util/grub-install.in
|
||||||
@@ -818,14 +818,16 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
|
@@ -818,14 +818,16 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
|
||||||
fi
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- "$nvsetenv" boot-device "$boot_device" || {
|
- "$nvsetenv" boot-device "$boot_device" || {
|
||||||
@ -25,16 +25,16 @@ index 293b756..2503aa0 100644
|
|||||||
- echo " setenv boot-device $boot_device" 1>&2
|
- echo " setenv boot-device $boot_device" 1>&2
|
||||||
- exit 1
|
- exit 1
|
||||||
- }
|
- }
|
||||||
+ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]; then
|
+ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]; then
|
||||||
+ "$nvsetenv" boot-device "$boot_device" || {
|
+ "$nvsetenv" boot-device "$boot_device" || {
|
||||||
+ # TRANSLATORS: The %s will be replaced by an external program name.
|
+ # TRANSLATORS: The %s will be replaced by an external program name.
|
||||||
+ gettext_printf "\`%s' failed.\n" "$nvsetenv" 1>&2
|
+ gettext_printf "\`%s' failed.\n" "$nvsetenv" 1>&2
|
||||||
+ gettext "You will have to set \`boot-device' variable manually. At the IEEE1275 prompt, type:" 1>&2
|
+ gettext "You will have to set \`boot-device' variable manually. At the IEEE1275 prompt, type:" 1>&2
|
||||||
+ echo 1>&2
|
+ echo 1>&2
|
||||||
+ echo " setenv boot-device $boot_device" 1>&2
|
+ echo " setenv boot-device $boot_device" 1>&2
|
||||||
+ exit 1
|
+ exit 1
|
||||||
+ }
|
+ }
|
||||||
+ fi
|
+ fi
|
||||||
fi
|
fi
|
||||||
elif [ x"${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = xmips-arc ]; then
|
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
|
||||||
|
Loading…
Reference in New Issue
Block a user