[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2281] 2009-06-08 Felix Zielcke <address@hidden>
From: |
Felix Zielcke |
Subject: |
[2281] 2009-06-08 Felix Zielcke <address@hidden> |
Date: |
Mon, 08 Jun 2009 20:51:17 +0000 |
Revision: 2281
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2281
Author: fzielcke
Date: 2009-06-08 20:51:16 +0000 (Mon, 08 Jun 2009)
Log Message:
-----------
2009-06-08 Felix Zielcke <address@hidden>
* util/i386/pc/grub-install.in: Add a parameter --disk-module
to choose between ata and biosdisk module on i386-pc.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/util/i386/pc/grub-install.in
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-08 20:23:09 UTC (rev 2280)
+++ trunk/grub2/ChangeLog 2009-06-08 20:51:16 UTC (rev 2281)
@@ -1,3 +1,8 @@
+2009-06-08 Felix Zielcke <address@hidden>
+
+ * util/i386/pc/grub-install.in: Add a parameter --disk-module
+ to choose between ata and biosdisk module on i386-pc.
+
2009-06-08 Oliver Henshaw <address@hidden>
* bus/usb/ohci.c (grub_ohci_pci_iter): Define the Class,
Modified: trunk/grub2/util/i386/pc/grub-install.in
===================================================================
--- trunk/grub2/util/i386/pc/grub-install.in 2009-06-08 20:23:09 UTC (rev
2280)
+++ trunk/grub2/util/i386/pc/grub-install.in 2009-06-08 20:51:16 UTC (rev
2281)
@@ -49,6 +49,12 @@
recheck=no
debug=no
+if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
+ disk_module=biosdisk
+else
+ disk_module=ata
+fi
+
# Usage: usage
# Print the usage.
usage () {
@@ -68,6 +74,13 @@
--no-floppy do not probe any floppy drive
--recheck probe a device map even if it already exists
--force install even if problems are detected
+EOF
+if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
+ cat <<EOF
+ --disk-module=MODULE disk module to use
+EOF
+fi
+ cat <<EOF
INSTALL_DEVICE can be a GRUB device name or a system device filename.
@@ -104,6 +117,10 @@
no_floppy="--no-floppy" ;;
--recheck)
recheck=yes ;;
+ --disk-module=*)
+ if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
+ disk_module=`echo "$option" | sed 's/--disk-module//'`
+ fi ;;
# This is an undocumented feature...
--debug)
debug=yes ;;
@@ -250,11 +267,7 @@
devabstraction_module=`$grub_probe --target=abstraction --device
${grub_device}`
# The order in this list is critical. Be careful when modifying it.
-if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
- modules="$modules biosdisk"
-else
- modules="$modules ata"
-fi
+modules="$modules $disk_module"
modules="$modules $fs_module $partmap_module $devabstraction_module"
prefix_drive=
@@ -269,11 +282,11 @@
# Strip partition number
install_drive="`echo ${install_drive} | sed -e s/,[0-9]*[a-z]*//g`"
grub_drive="`echo ${grub_drive} | sed -e s/,[0-9]*[a-z]*//g`"
- if [ "${target_cpu}-${platform}" != "i386-pc" ] ; then
- # generic method (used on coreboot)
+ if [ "$disk_module" = ata ] ; then
+ # generic method (used on coreboot and ata mod)
uuid="`$grub_probe --target=fs_uuid --device ${grub_device}`"
if [ "x${uuid}" = "x" ] ; then
- echo "UUID needed on this platform, but the filesystem containing
${grubdir} does not support UUIDs." 1>&2
+ echo "UUID needed on this platform and with ata mod, but the
filesystem containing ${grubdir} does not support UUIDs." 1>&2
exit 1
fi
prefix_drive="(UUID=${uuid})"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2281] 2009-06-08 Felix Zielcke <address@hidden>,
Felix Zielcke <=