[grub2: 11/22] update grub-2.00-Dont-set-boot-on-ppc.patch to beta6

Peter Jones pjones at fedoraproject.org
Mon Jun 4 15:50:43 UTC 2012


commit fa2c25cfff6b2a398902458fdc659636e8bfab7a
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Sat Jun 2 01:54:16 2012 +0200

    update grub-2.00-Dont-set-boot-on-ppc.patch to beta6

 grub-2.00-Dont-set-boot-on-ppc.patch |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/grub-2.00-Dont-set-boot-on-ppc.patch b/grub-2.00-Dont-set-boot-on-ppc.patch
index 11869af..c2051f4 100644
--- a/grub-2.00-Dont-set-boot-on-ppc.patch
+++ b/grub-2.00-Dont-set-boot-on-ppc.patch
@@ -14,7 +14,7 @@ index 293b756..2503aa0 100644
 --- a/util/grub-install.in
 +++ b/util/grub-install.in
 @@ -818,14 +818,16 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
-         fi
+ 	    }
  	fi
  
 -	"$nvsetenv" boot-device "$boot_device" || {
@@ -25,16 +25,16 @@ index 293b756..2503aa0 100644
 -	    echo "  setenv boot-device $boot_device" 1>&2
 -	    exit 1
 -	}
-+        if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]; then
-+    	    "$nvsetenv" boot-device "$boot_device" || {
++	if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]; then
++	    "$nvsetenv" boot-device "$boot_device" || {
 +	        # TRANSLATORS: The %s will be replaced by an external program name.
-+                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
-+                echo 1>&2
-+                echo "  setenv boot-device $boot_device" 1>&2
-+                exit 1
-+            }
-+        fi
++	        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
++	        echo 1>&2
++	        echo "  setenv boot-device $boot_device" 1>&2
++	        exit 1
++	    }
++	fi
      fi
  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


More information about the scm-commits mailing list