rpms/grub/devel grub-fedora-8.patch,1.2,1.3 grub.spec,1.57,1.58

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5324

Modified Files:
	grub-fedora-8.patch grub.spec 
Log Message:
- update to -19


grub-fedora-8.patch:

Index: grub-fedora-8.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-8.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-fedora-8.patch	20 Aug 2007 22:20:19 -0000	1.2
+++ grub-fedora-8.patch	20 Sep 2007 20:14:20 -0000	1.3
@@ -11329,13 +11329,13 @@
  @set VERSION 0.97
 diff --git a/grub.spec b/grub.spec
 new file mode 100644
-index 0000000..fcf767f
+index 0000000..36b39eb
 --- /dev/null
 +++ b/grub.spec
-@@ -0,0 +1,413 @@
+@@ -0,0 +1,416 @@
 +Name: grub
 +Version: 0.97
-+Release: 16
++Release: 17
 +Summary: GRUB - the Grand Unified Boot Loader.
 +Group: System Environment/Base
 +License: GPL
@@ -11414,6 +11414,9 @@
 +%{_datadir}/grub
 +
 +%changelog
++* Thu Sep 20 2007 Peter Jones <pjones at redhat.com> - 0.97-17
++- Fix dmraid detection on Intel (isw) controllers in grub-install .
++
 +* Tue Aug 7 2007 Peter Jones <pjones at redhat.com> - 0.97-16
 +- Add ext[23] large inode support (patch from Eric Sandeen)
 +- Fix auto* breakage that happened when we switched from autoreconf to autoconf
@@ -21595,6 +21598,13 @@
 +#endif /* SUPPORT_GRAPHICS */
 +
  #endif /* ! GRUB_TERM_HEADER */
+diff --git a/test b/test
+new file mode 100644
+index 0000000..b182379
+--- /dev/null
++++ b/test
+@@ -0,0 +1 @@
++fo of fo
 diff --git a/util/Makefile.am b/util/Makefile.am
 index 2e04711..48604d6 100644
 --- a/util/Makefile.am
@@ -21944,7 +21954,7 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
 diff --git a/util/grub-install.in b/util/grub-install.in
-index 2e598b0..3c6a4f5 100644
+index 2e598b0..5ceb77d 100644
 --- a/util/grub-install.in
 +++ b/util/grub-install.in
 @@ -21,26 +21,28 @@
@@ -21988,7 +21998,7 @@
  
  INSTALL_DEVICE can be a GRUB device name or a system device filename.
  
-@@ -96,17 +100,26 @@ convert () {
+@@ -96,17 +100,28 @@ convert () {
      # Break the device name into the disk part and the partition part.
      case "$host_os" in
      linux*)
@@ -22003,6 +22013,7 @@
 -	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
 +				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
 +	  -e 's%\(/mapper/[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
++	  -e 's%\(/mapper/isw_[[:alpha:]_]\+[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
 +	  -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
 +	tmp_part=`echo "$1" | grep -v '/mapper/control$' |
 +		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
@@ -22014,12 +22025,13 @@
 -				  -e 's%.*c[0-7]d[0-9]*p%%'`
 +				  -e 's%.*c[0-7]d[0-9]*p%%' \
 +	  -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
++	  -e 's%.*/mapper/isw_[[:alpha:]_]\+[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
 +	  -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
 +		grep -v '.*/mapper/.*'`
  	;;
      gnu*)
  	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
-@@ -196,7 +209,7 @@ resolve_symlink () {
+@@ -196,7 +211,7 @@ resolve_symlink () {
  	while test -L $tmp_fname; do
  		tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'`
  		if test -z "$tmp_new_fname"; then
@@ -22028,7 +22040,7 @@
  			exit 1
  		fi
  
-@@ -211,6 +224,80 @@ resolve_symlink () {
+@@ -211,6 +226,80 @@ resolve_symlink () {
  	echo "$tmp_fname"
  }
  
@@ -22109,7 +22121,7 @@
  # Usage: find_device file
  # Find block device on which the file resides.
  find_device () {
-@@ -219,15 +306,55 @@ find_device () {
+@@ -219,15 +308,55 @@ find_device () {
      tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ 	]*\).*%\1%p'`
  
      if test -z "$tmp_fname"; then
@@ -22168,7 +22180,7 @@
  # Check the arguments.
  for option in "$@"; do
      case "$option" in
-@@ -247,6 +374,8 @@ for option in "$@"; do
+@@ -247,6 +376,8 @@ for option in "$@"; do
  	force_lba="--force-lba" ;;
      --recheck)
  	recheck=yes ;;
@@ -22177,7 +22189,7 @@
      # This is an undocumented feature...
      --debug)
  	debug=yes ;;
-@@ -265,12 +394,6 @@ for option in "$@"; do
+@@ -265,12 +396,6 @@ for option in "$@"; do
      esac
  done
  
@@ -22190,7 +22202,7 @@
  # If the debugging feature is enabled, print commands.
  if test $debug = yes; then
      set -x
-@@ -293,6 +416,26 @@ esac
+@@ -293,6 +418,26 @@ esac
  grubdir=${bootdir}/grub
  device_map=${grubdir}/device.map
  
@@ -22217,7 +22229,7 @@
  # Check if GRUB is installed.
  # This is necessary, because the user can specify "grub --read-only".
  set $grub_shell dummy
-@@ -303,17 +446,17 @@ else
+@@ -303,17 +448,17 @@ else
      exit 1
  fi
  
@@ -22239,7 +22251,7 @@
      exit 1
  fi
  
-@@ -324,9 +467,11 @@ fi
+@@ -324,9 +469,11 @@ fi
  test -d "$bootdir" || mkdir "$bootdir" || exit 1
  test -d "$grubdir" || mkdir "$grubdir" || exit 1
  
@@ -22252,7 +22264,7 @@
  fi
  
  # Create the device map file if it is not present.
-@@ -336,6 +481,10 @@ else
+@@ -336,6 +483,10 @@ else
      # Create a safe temporary file.
      test -n "$mklog" && log_file=`$mklog`
  
@@ -22263,7 +22275,7 @@
      $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
  quit
  EOF
-@@ -351,34 +500,60 @@ fi
+@@ -351,34 +502,60 @@ fi
  tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \
      | sort | uniq -d | sed -n 1p`
  if test -n "$tmp"; then
@@ -22334,7 +22346,7 @@
  
  # Check if the boot directory is in the same device as the root directory.
  if test "x$root_device" != "x$bootdir_device"; then
-@@ -387,15 +562,8 @@ if test "x$root_device" != "x$bootdir_device"; then
+@@ -387,15 +564,8 @@ if test "x$root_device" != "x$bootdir_device"; then
      grub_prefix="/grub"
  fi
  
@@ -22352,7 +22364,7 @@
  
  if test "x$grubdir_device" != "x$root_device"; then
      # For now, cannot deal with this situation.
-@@ -406,61 +574,66 @@ EOF
+@@ -406,61 +576,66 @@ EOF
      exit 1
  fi
  


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- grub.spec	22 Aug 2007 14:32:39 -0000	1.57
+++ grub.spec	20 Sep 2007 20:14:20 -0000	1.58
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 18
+Release: 19
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -79,6 +79,9 @@
 %{_datadir}/grub
 
 %changelog
+* Thu Sep 20 2007 Peter Jones <pjones at redhat.com> - 0.97-19
+- Fix dmraid detection on Intel (isw) controllers in grub-install .
+
 * Wed Aug 22 2007 Peter Jones <pjones at redhat.com> - 0.97-18
 - Fix license tag.