packages: grubby/grubby-geninitrd.patch, grubby/grubby.spec - up to 7.0.16

[glen]

Author: glen                         Date: Mon Feb 14 12:02:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 7.0.16

---- Files affected:
packages/grubby:
   grubby-geninitrd.patch (1.9 -> 1.10) , grubby.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/grubby/grubby-geninitrd.patch
diff -u packages/grubby/grubby-geninitrd.patch:1.9 packages/grubby/grubby-geninitrd.patch:1.10
--- packages/grubby/grubby-geninitrd.patch:1.9	Thu Jul 16 11:38:21 2009
+++ packages/grubby/grubby-geninitrd.patch	Mon Feb 14 13:02:30 2011
@@ -1,37 +1,26 @@
---- grubby-7.0/new-kernel-pkg~	2009-07-16 12:26:14.000000000 +0300
-+++ grubby-7.0/new-kernel-pkg	2009-07-16 12:29:41.029773021 +0300
+--- 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
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  #
  # Invoked upon installation or removal of a kernel package, the following
  # tasks are/can be done here:
-@@ -114,15 +115,12 @@
- 	return
+@@ -139,7 +139,9 @@
      fi
  
--    # get the root filesystem to use; if it's on a label make sure it's
--    # been configured. if not, get the root device from mount
+     # get the root filesystem to use
 -    rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
--    short=$(echo $rootdevice | cut -d= -f1)
--    if [ "$short" == "LABEL" -o "$short" == "UUID" ]; then
--	device=$(echo resolveDevice "$rootdevice" | /sbin/nash  --forcequiet)
--	if [ -z "$device" ]; then
--	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
--	fi
-+    # get the root filesystem to use
 +    . /lib/geninitrd/functions
 +    find_root /etc/fstab || exit
 +    rootdevice=$rootdev
-+    if [ -z "$rootdevice" ]; then
-+	rootdevice=$(mount | awk '$3 == "/" { print $1 }')
-     fi
  
      if [ -n "$mbkernel" -a -n "$cfgLilo" -a "$liloFlag" != "elilo" ]; then
-@@ -268,6 +268,8 @@
+ 	[ -n "$verbose" ] && echo "multiboot specified, not updating lilo.conf"
+@@ -289,6 +291,8 @@
  mkinitrd() {
-     if [ -n "$USEDRACUT" -a -x /sbin/dracut ]; then
-         tool="/sbin/dracut -f $initrdfile $version"
+     if [ -n "$dracut" ]; then
+         tool="/sbin/dracut $dracuthostonly -f $initrdfile $version"
 +    elif [ -x /sbin/geninitrd ]; then
 +	tool="/sbin/geninitrd -f --initrdfs=rom $initrdfile $version"
      else

================================================================
Index: packages/grubby/grubby.spec
diff -u packages/grubby/grubby.spec:1.29 packages/grubby/grubby.spec:1.30
--- packages/grubby/grubby.spec:1.29	Mon Sep 28 18:53:56 2009
+++ packages/grubby/grubby.spec	Mon Feb 14 13:02:30 2011
@@ -2,18 +2,16 @@
 #
 # Conditional build:
 %bcond_without	tests		# skip tests
-#
+
 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:	7.0
-Release:	2
+Version:	7.0.16
+Release:	1
 License:	GPL v2
 Group:		Base
-# git clone git://git.fedorahosted.org/git/grubby.git
-# git archive --format=tar --prefix=grubby-%{version}/ HEAD | bzip2 > grubby-%{version}.tar.bz2
-Source0:	%{name}-%{version}.tar.bz2
-# Source0-md5:	6c2fe5d01dc392abb8d05d43fc79416a
+Source0:	http://pkgs.fedoraproject.org/repo/pkgs/grubby/%{name}-%{version}.tar.bz2/d838a5f794573f5704248b8322bf3643/grubby-%{version}.tar.bz2
+# Source0-md5:	d838a5f794573f5704248b8322bf3643
 URL:		http://git.fedorahosted.org/git/grubby.git
 Patch0:		%{name}-menu.lst.patch
 Patch1:		%{name}-pld.patch
@@ -72,6 +70,8 @@
 %attr(755,root,root) %{_sbindir}/grubby
 %attr(755,root,root) %{_sbindir}/installkernel
 %{_mandir}/man8/grubby.8*
+%{_mandir}/man8/installkernel.8*
+%{_mandir}/man8/new-kernel-pkg.8*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -79,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2011/02/14 12:02:30  glen
+- up to 7.0.16
+
 Revision 1.29  2009/09/28 16:53:56  glen
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-geninitrd.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby.spec?r1=1.29&r2=1.30&f=u