rpms/bootchart/devel bootchart-0.9-readonly-root.patch, NONE, 1.1 bootchart.spec, 1.5, 1.6

[Warren Togami 砥上勇 (wtogami)]

Author: wtogami

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

Modified Files:
	bootchart.spec 
Added Files:
	bootchart-0.9-readonly-root.patch 
Log Message:
- Make bootchart work with readonly root
- Stop data collection when ldm process appears
- Make install/remove work in a chroot without grub.conf


bootchart-0.9-readonly-root.patch:

--- NEW FILE bootchart-0.9-readonly-root.patch ---
diff -urN bootchart-0.9.orig/script/bootchartd bootchart-0.9/script/bootchartd
--- bootchart-0.9.orig/script/bootchartd	2005-11-13 12:40:01.000000000 -0500
+++ bootchart-0.9/script/bootchartd	2008-03-19 15:32:32.000000000 -0400
@@ -43,7 +43,8 @@
 	# boot), a tmpfs is mounted in /mnt.  The mount point is immediately
 	# released using a lazy umount, so the script must never leave that
 	# directory.
-	LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXXX 2>/dev/null )"
+        # /dev is used because it survives boot read-write even with readonly root
+	LOG_DIR="$( mktemp -d /dev/bootchart.XXXXXX 2>/dev/null )"
 	if [ -z "$LOG_DIR" ]; then
 		LOG_DIR="/mnt"
 		LAZY_UMOUNT="yes"
@@ -117,7 +118,7 @@
 	local runlevel=$( sed -n 's/.*:\(.*\):initdefault:.*/\1/gp' /etc/inittab )
 
 	# The processes we have to wait for
-	local exit_proc="gdmgreeter gdm-binary kdm_greet kdm"
+	local exit_proc="gdmgreeter gdm-binary kdm_greet kdm ldm"
 	# early_login in FC4 starts gdm early, so fall back to mingetty
 	local early_login="no"
 	grep -q early_login /proc/cmdline && early_login="yes"


Index: bootchart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bootchart/devel/bootchart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bootchart.spec	18 Feb 2008 18:54:37 -0000	1.5
+++ bootchart.spec	16 Apr 2008 22:47:49 -0000	1.6
@@ -1,10 +1,11 @@
 Name:           bootchart 
 Version:        0.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Boot Process Performance Visualization
 License:        GPLv3+
 URL:            http://www.bootchart.org/
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         bootchart-0.9-readonly-root.patch
 Group:          Applications/System
 Requires:       jpackage-utils >= 0:1.5
 Requires:       jakarta-commons-cli >= 0:1.0
@@ -15,7 +16,7 @@
 BuildRequires:  java-gcj-compat-devel
 Requires(post): java-gcj-compat
 Requires(postun): java-gcj-compat
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 A tool for performance analysis and visualization of the GNU/Linux boot
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # Remove the bundled commons-cli
@@ -55,7 +57,7 @@
 
 %post
 # Add a new grub/lilo entry
-if [ -x /sbin/grubby ]; then
+if [ -x /sbin/grubby ] && [ -e /boot/grub/grub.conf ]; then
     eval $( /sbin/grubby --info /boot/vmlinuz-$(uname -r) ) >& /dev/null
     if [ "x$kernel" != "x" ]; then
 	echo /sbin/grubby --update-kernel=/boot"$kernel" --args="init=/sbin/bootchartd"
@@ -68,7 +70,7 @@
 
 %preun
 # Remove the grub/lilo entry, but only on uninstall, not on upgrade
-if [ $1 -eq 0 -a -x /sbin/grubby ]; then
+if [ $1 -eq 0 ] && [ -x /sbin/grubby ] && [ -e /boot/grub/grub.conf ]; then
     grubby --update-kernel=ALL --remove-args="init=/sbin/bootchartd"
 fi
 if [ -x %{_bindir}/rebuild-gcj-db ]; then
@@ -86,6 +88,11 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Mar 19 2008 Warren Togami <wtogami at redhat.com> - 0.9-9
+- Make bootchart work with readonly root
+- Stop data collection when ldm process appears
+- Make install/remove work in a chroot without grub.conf
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9-8
 - Autorebuild for GCC 4.3