rpms/bootchart/devel bootchart.spec,1.2,1.3

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/bootchart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15199

Modified Files:
	bootchart.spec 
Log Message:
* Tue Jan 22 2008 Adam Jackson <ajax at redhat.com> 0.9-7
- Only munge the grub config for the currently-running kernel; otherwise,
  if you dual-boot between multiple Linuxes, installing bootchart on one
  will break boot of the other.  Note that if you have multiple roots
  running the same kernel, this will still break.



Index: bootchart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bootchart/devel/bootchart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bootchart.spec	29 Oct 2007 20:12:20 -0000	1.2
+++ bootchart.spec	22 Jan 2008 16:37:33 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bootchart 
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Boot Process Performance Visualization
 License:        GPLv3+
 URL:            http://www.bootchart.org/
@@ -56,7 +56,10 @@
 %post
 # Add a new grub/lilo entry
 if [ -x /sbin/grubby ]; then
-    grubby --update-kernel=ALL --args="init=/sbin/bootchartd"
+    eval $( /sbin/grubby --info /boot/vmlinuz-$(uname -r) ) >& /dev/null
+    if [ "x$kernel" != "x" ]; then
+	/sbin/grubby --update-kernel="$kernel" --args="init=/sbin/bootchartd"
+    fi
 fi
 if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
@@ -82,6 +85,12 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Tue Jan 22 2008 Adam Jackson <ajax at redhat.com> 0.9-7
+- Only munge the grub config for the currently-running kernel; otherwise,
+  if you dual-boot between multiple Linuxes, installing bootchart on one
+  will break boot of the other.  Note that if you have multiple roots
+  running the same kernel, this will still break.
+
 * Mon Oct 29 2007 Adam Jackson <ajax at redhat.com> 0.9-6
 - Don't remove bootchart from grub.conf on upgrade. (#349101)