File fix-factory.diff of Package bootchart

Overview Repositories Revisions Requests Users Attributes Meta

File fix-factory.diff of Package bootchart (Revision f872f3cc34da6aba0b66fa4fea82c18b)

Currently displaying revision f872f3cc34da6aba0b66fa4fea82c18b , Show latest

Index: bootchart2-0.0.9/bootchartd
===================================================================
--- bootchart2-0.0.9.orig/bootchartd
+++ bootchart2-0.0.9/bootchartd
@@ -82,7 +82,7 @@ start()
 	# the collector will just keep
 	# running with no-one to stop it, so bail here.
 	if [ "$JAIL" == "$JAIL_INITRD" ]; then
-	    if ! grep -q init=/sbin/bootchartd proc/cmdline; then
+	    if ! /bin/grep -q init=/sbin/bootchartd proc/cmdline; then
 		echo "aborting initrd bootchart setup - init not set."
 		umount proc
 		return
@@ -94,15 +94,14 @@ start()
 		echo "bootchartd init" >> kmsg
 		if [ "`uname -m`" = "x86_64" ]
 		then
-			mkdir $JAIL/lib64
-			cp /lib64/ld-linux-x86-64.so.* $JAIL/lib64
+			mkdir -p $JAIL/lib64
+			cp /lib64/ld-linux-x86-64.so.* /lib64/libc.so.* $JAIL/lib64
 		else
 			mkdir -p $JAIL/lib
-			cp /lib/ld-linux.so.* $JAIL/lib
+			cp /lib/ld-linux.so.* /lib/libc.so.* $JAIL/lib
 		fi
-		cp /lib/libc.so.* $JAIL/lib
 
-		mkdir $JAIL/lib/bootchart
+		mkdir -p $JAIL/lib/bootchart
 		cp /lib/bootchart/bootchart-collector $JAIL/lib/bootchart
 	fi
 
@@ -121,7 +120,7 @@ start()
 
 	# Otherwise start in a chroot jail
 	elif [ -n "$IN_INIT" ]; then
-		chroot $JAIL /lib/bootchart/bootchart-collector -p proc $SAMPLE_HZ # 2>/dev/null &
+		/bin/chroot $JAIL /lib/bootchart/bootchart-collector -p proc $SAMPLE_HZ
 
 	# Otherwise, manually launched to profile something
 	else
@@ -165,7 +164,7 @@ wait_boot()
 		if [ -n "$exit_proc" -a -n "$( pidof $exit_proc )" ]; then
 			# give an unambiguous settle afterwards - so we get
 			# more post-login data for slow systems
-			sleep 20
+			/bin/sleep 20
 
 			# Write / flush the log files
 			stop
@@ -275,10 +274,10 @@ if [ $$ -eq 1 ]; then
 	else # running inside the main system
 		echo "acute oddness - why can't we detect this !?" >> /dev/kmsg
 		ls -al /dev >> /dev/kmsg
-		if [ -c /dev/.bootchart/kmsg ]; then
+		if [ -c $JAIL_INITRD/kmsg ]; then
 			echo "bootchart - has kmsg" >> /dev/kmsg
 		fi
-		if [ -d /dev/.bootchart ]; then
+		if [ -d $JAIL_INITRD ]; then
 			echo "bootchart: start wait for completion" >> /dev/kmsg
 			wait_boot &
 		else # perhaps we had no initrd

Places

File fix-factory.diff of Package bootchart (Revision f872f3cc34da6aba0b66fa4fea82c18b)

Places