Rebase to grub-2.00 release.
This commit is contained in:
parent
4ce656b370
commit
a37bbabf64
@ -10,10 +10,10 @@ there is no way to set boot-device.
|
|||||||
1 file changed, 10 insertions(+), 8 deletions(-)
|
1 file changed, 10 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
diff --git a/util/grub-install.in b/util/grub-install.in
|
diff --git a/util/grub-install.in b/util/grub-install.in
|
||||||
index 293b756..2503aa0 100644
|
index e19f1cd..69a97ad 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" ]
|
@@ -807,14 +807,16 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -37,7 +37,4 @@ index 293b756..2503aa0 100644
|
|||||||
+ 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
|
||||||
--
|
|
||||||
1.7.10.1
|
|
||||||
|
|
||||||
|
@ -381,6 +381,9 @@ fi
|
|||||||
%doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0
|
%doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 28 2012 Peter Jones <pjones@redhat.com> - 2.00-1
|
||||||
|
- Rebase to grub-2.00 release.
|
||||||
|
|
||||||
* Mon Jun 18 2012 Peter Jones <pjones@redhat.com> - 2.0-0.37.beta6
|
* Mon Jun 18 2012 Peter Jones <pjones@redhat.com> - 2.0-0.37.beta6
|
||||||
- Fix double-free in grub-probe.
|
- Fix double-free in grub-probe.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user