add a --disk-module option to grub-install
PATCH 1/1 add a --disk-module option to grub-install
Here's a patch which adds --disk-module to grub-install for i386-pc to make it easier for users to try out ata mod instead of biosdisk.
Signature · 1 line
Felix Zielcke
2009-06-04 Felix Zielcke <[email protected]>
* util/i386/pc/grub-install.in: Add a parameter --disk-module.
util/i386/pc/grub-install.in +17 -8
@@ -49,6 +49,12 @@ force_lba= 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 @@ Install GRUB on your drive. --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.
@@ -250,11 +263,7 @@ partmap_module=`$grub_probe --target=partmap --device ${grub_device} 2> /dev/nul 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 +278,11 @@ if [ "x${devabstraction_module}" = "x" ] ; then # 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})"
Am Donnerstag, den 04.06.2009, 20:57 +0200 schrieb Felix Zielcke:
Quoted 2 lines
Here's a patch which adds --disk-module to grub-install for i386-pc to make it easier for users to try out ata mod instead of biosdisk.
Args I forgot the actual parsing of the option.
Signature · 1 line
Felix Zielcke
util/i386/pc/grub-install.in +21 -8
@@ -49,6 +49,12 @@ force_lba= 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 @@ Install GRUB on your drive. --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 @@ for option in "$@"; do 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 @@ partmap_module=`$grub_probe --target=partmap --device ${grub_device} 2> /dev/nul 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 @@ if [ "x${devabstraction_module}" = "x" ] ; then # 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})"
- # 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 IMO it would be better to remove "on this platform" part. Otherwise patch looks ok, I will test it tomorrow
Quoted 14 lines · Felix Zielcke
Am Donnerstag, den 04.06.2009, 20:57 +0200 schrieb Felix Zielcke:
Quoted 2 lines
Here's a patch which adds --disk-module to grub-install for i386-pc to make it easier for users to try out ata mod instead of biosdisk.
Args I forgot the actual parsing of the option.
--
Felix Zielcke_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel
Signature · 2 lines
Regards Vladimir 'phcoder' Serbinenko
Am Freitag, den 05.06.2009, 23:26 +0200 schrieb Vladimir 'phcoder' Serbinenko:
Quoted 11 lines
util/i386/pc/grub-install.in +2
-2- # 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 filesystemcontaining ${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 IMO it would be better to remove "on this platform" part. Otherwise patch looks ok, I will test it tomorrow
Commited with it removed.
Quoted 6 lines · Felix Zielcke
Quoted 5 lines
Am Donnerstag, den 04.06.2009, 20:57 +0200 schrieb Felix Zielcke:
Quoted 2 lines
Here's a patch which adds --disk-module to grub-install for i386-pc to make it easier for users to try out ata mod instead of biosdisk.
Args I forgot the actual parsing of the option.
Signature · 1 line
Felix Zielcke