packages: grubby/grubby-geninitrd.patch, grubby/grubby-menu.lst.patch, grub...

[glen]

Author: glen                         Date: Mon Mar  5 14:56:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 8.9

---- Files affected:
packages/grubby:
   grubby-geninitrd.patch (1.11 -> 1.12) , grubby-menu.lst.patch (1.4 -> 1.5) , grubby.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/grubby/grubby-geninitrd.patch
diff -u packages/grubby/grubby-geninitrd.patch:1.11 packages/grubby/grubby-geninitrd.patch:1.12
--- packages/grubby/grubby-geninitrd.patch:1.11	Wed Oct 26 11:06:18 2011
+++ packages/grubby/grubby-geninitrd.patch	Mon Mar  5 15:56:09 2012
@@ -1,5 +1,5 @@
---- grubby-7.0.16/new-kernel-pkg~	2011-02-14 13:51:39.000000000 +0200
-+++ grubby-7.0.16/new-kernel-pkg	2011-02-14 13:53:52.900519027 +0200
+--- grubby-8.9/./new-kernel-pkg~	2012-03-05 16:52:13.000000000 +0200
++++ grubby-8.9/./new-kernel-pkg	2012-03-05 16:53:00.714608856 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -17,12 +17,12 @@
  
      if [ -n "$mbkernel" -a -n "$cfgLilo" -a "$liloFlag" != "elilo" ]; then
  	[ -n "$verbose" ] && echo "multiboot specified, not updating lilo.conf"
-@@ -289,6 +291,8 @@
+@@ -509,6 +509,8 @@
  mkinitrd() {
      if [ -n "$dracut" ]; then
-         tool="/sbin/dracut $dracuthostonly -f $initrdfile $version"
-+    elif [ -x /sbin/geninitrd ]; then
+         tool="dracut $dracuthostonly -f $initrdfile $version"
++    elif [ -x "/sbin/geninitrd" ]; then
 +	tool="/sbin/geninitrd -f $initrdfile $version"
      else
- 	tool="/sbin/mkinitrd --allow-missing -f $initrdfile $version"
+ 	tool="mkinitrd --allow-missing -f $initrdfile $version"
      fi

================================================================
Index: packages/grubby/grubby-menu.lst.patch
diff -u packages/grubby/grubby-menu.lst.patch:1.4 packages/grubby/grubby-menu.lst.patch:1.5
--- packages/grubby/grubby-menu.lst.patch:1.4	Wed Oct 26 11:36:06 2011
+++ packages/grubby/grubby-menu.lst.patch	Mon Mar  5 15:56:09 2012
@@ -1,14 +1,3 @@
---- grubby-8.3/grubby.c~	2011-09-29 23:38:12.000000000 +0300
-+++ grubby-8.3/grubby.c	2011-10-26 12:10:12.124419102 +0300
-@@ -157,7 +157,7 @@
- };
- 
- struct configFileInfo grubConfigType = {
--    .defaultConfig = "/etc/grub.conf",
-+    .defaultConfig = "/boot/grub/menu.lst",
-     .keywords = grubKeywords,
-     .defaultIsIndex = 1,
-     .defaultSupportSaved = 1,
 --- grubby-8.3/new-kernel-pkg~	2011-09-29 23:38:12.000000000 +0300
 +++ grubby-8.3/new-kernel-pkg	2011-10-26 12:11:06.743604439 +0300
 @@ -91,7 +91,7 @@
@@ -20,3 +9,17 @@
      grub2Config=$(readlink -f /etc/grub2.cfg 2>/dev/null)
      grub2EfiConfig=$(readlink -f /etc/grub2-efi.cfg 2>/dev/null)
      bootPrefix=/boot
+--- grubby-8.9/grubby.8~	2012-03-03 00:13:40.000000000 +0200
++++ grubby-8.9/grubby.8	2012-03-05 16:52:06.992164349 +0200
+@@ -23,9 +23,9 @@
+ kernels and need to find information about the current boot environment.
+ 
+ On Intel x86 platforms, \fBgrub\fR is the default bootloader and the
+-configuration file is in \fB/boot/grub/grub.conf\fR. On Intel ia64 platforms, 
++configuration file is in \fB/boot/grub/menu.lst\fR. On Intel ia64 platforms, 
+ \fBelilo\fR mode is used and the default location for the configuration file 
+-is \fB/boot/grub/grub.conf\fR. On PowerPC platforms, \fByaboot\fR parsing
++is \fB/boot/grub/menu.lst\fR. On PowerPC platforms, \fByaboot\fR parsing
+ is used and the configuration file should be in \fB/etc/yaboot.conf\fR.
+ 
+ There are a number of ways to specify the kernel used for \fB-\-info\fR,

================================================================
Index: packages/grubby/grubby.spec
diff -u packages/grubby/grubby.spec:1.31 packages/grubby/grubby.spec:1.32
--- packages/grubby/grubby.spec:1.31	Wed Oct 26 11:36:06 2011
+++ packages/grubby/grubby.spec	Mon Mar  5 15:56:09 2012
@@ -6,12 +6,12 @@
 Summary:	Command line tool for updating bootloader configs
 Summary(pl.UTF-8):	Działające z linii poleceń narzędzie do konfiguracji gruba, lilo i elilo
 Name:		grubby
-Version:	8.3
+Version:	8.9
 Release:	1
 License:	GPL v2
 Group:		Base
-Source0:	http://pkgs.fedoraproject.org/repo/pkgs/grubby/%{name}-%{version}.tar.bz2/b8ca2090b1ef8c107f0e5f5caa26f2f1/%{name}-%{version}.tar.bz2
-# Source0-md5:	b8ca2090b1ef8c107f0e5f5caa26f2f1
+Source0:	http://pkgs.fedoraproject.org/repo/pkgs/grubby/%{name}-%{version}.tar.bz2/f0f27d7e78ad1452e7d0bf0bf4ca0fc6/grubby-%{version}.tar.bz2
+# Source0-md5:	f0f27d7e78ad1452e7d0bf0bf4ca0fc6
 URL:		http://git.fedorahosted.org/git/grubby.git
 Patch0:		%{name}-menu.lst.patch
 Patch1:		%{name}-pld.patch
@@ -79,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2012/03/05 14:56:09  glen
+- up to 8.9
+
 Revision 1.31  2011/10/26 09:36:06  glen
 - up to 8.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-geninitrd.patch?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-menu.lst.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby.spec?r1=1.31&r2=1.32&f=u