rpms/event-compat-sysv/devel event-compat-sysv-mods.patch, 1.2, 1.3 event-compat-sysv.spec, 1.3, 1.4

[Casey Dahlin (sadmac)]

Author: sadmac

Update of /cvs/pkgs/rpms/event-compat-sysv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27388/devel

Modified Files:
	event-compat-sysv-mods.patch event-compat-sysv.spec 
Log Message:
Fix for bug #434555


event-compat-sysv-mods.patch:

Index: event-compat-sysv-mods.patch
===================================================================
RCS file: /cvs/pkgs/rpms/event-compat-sysv/devel/event-compat-sysv-mods.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- event-compat-sysv-mods.patch	11 Feb 2008 20:20:33 -0000	1.2
+++ event-compat-sysv-mods.patch	22 Feb 2008 22:33:55 -0000	1.3
@@ -84,6 +84,35 @@
 -	exec /etc/init.d/rc 6
 +	exec /etc/rc.d/rc 6
  end script
+diff -urN example-jobs-0.3.9/rc-default example-jobs-0.3.9-mods/rc-default
+--- example-jobs-0.3.9/rc-default	2007-02-08 18:35:02.000000000 -0500
++++ example-jobs-0.3.9-mods/rc-default	2008-02-22 17:11:58.000000000 -0500
+@@ -8,16 +8,15 @@
+ script
+ 	runlevel --reboot || true
+ 
+-	if grep -q -w -- "-s\|single\|S" /proc/cmdline; then
+-	    telinit S
+-	elif [ -r /etc/inittab ]; then
++	RL="2"
++	if [ -r /etc/inittab ]; then
+ 	    RL="$(sed -n -e "/^id:[0-9]*:initdefault:/{s/^id://;s/:.*//;p}" /etc/inittab || true)"
+-	    if [ -n "$RL" ]; then
+-		telinit $RL
+-	    else
+-		telinit 2
+-	    fi
+-	else
+-	    telinit 2
+ 	fi
++	for t in $(cat /proc/cmdline); do
++		case $t in
++			-s|single|S) RL="S" ;;
++			[1-9])       RL="$t" ;;
++		esac
++	done
++	telinit $RL
+ end script
 diff -urN example-jobs-0.3.9/rcS example-jobs-0.3.9-mods/rcS
 --- example-jobs-0.3.9/rcS	2007-02-08 18:35:04.000000000 -0500
 +++ example-jobs-0.3.9-mods/rcS	2008-01-14 23:13:01.000000000 -0500


Index: event-compat-sysv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/event-compat-sysv/devel/event-compat-sysv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- event-compat-sysv.spec	11 Feb 2008 20:20:33 -0000	1.3
+++ event-compat-sysv.spec	22 Feb 2008 22:33:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           event-compat-sysv
 Version:        0.3.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Upstart events to emulate SysVInit
 
 Group:          System Environment/Base
@@ -81,6 +81,9 @@
 %doc COPYING
 
 %changelog
+* Fri Feb 22 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-7
+- Fix for bug #434555
+
 * Fri Feb 08 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-6
 - Removed dependency on sysvinit-tools (auto-filedeps should handle this)
 - Made single user mode go direct to shell