rpms/event-compat-sysv/devel event-compat-sysv-rhmods.patch, 1.3, 1.4 event-compat-sysv.spec, 1.9, 1.10

[Bill Nottingham (notting)]

Author: notting

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

Modified Files:
	event-compat-sysv-rhmods.patch event-compat-sysv.spec 
Log Message:
key on the right thing in inittab


event-compat-sysv-rhmods.patch:

Index: event-compat-sysv-rhmods.patch
===================================================================
RCS file: /cvs/extras/rpms/event-compat-sysv/devel/event-compat-sysv-rhmods.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- event-compat-sysv-rhmods.patch	4 Apr 2008 14:55:15 -0000	1.3
+++ event-compat-sysv-rhmods.patch	4 Apr 2008 15:09:27 -0000	1.4
@@ -133,7 +133,7 @@
 +	runlevel --reboot || true
  
 -	exec /etc/init.d/rcS
-+	runlevel=$(/bin/awk -F ':' '/^id:/ { print $2 }' /etc/inittab)
++	runlevel=$(/bin/awk -F ':' '$3 == "initdefault" { print $2 }' /etc/inittab)
 +	[ -z "$runlevel" ] && runlevel="3"
 +	for t in $(cat /proc/cmdline); do
 +		case $t in
@@ -163,7 +163,7 @@
 -	else
 -	    telinit 2
 -	fi
-+	runlevel=$(/bin/awk -F ':' '/^id:/ { print $2 }' /etc/inittab)
++	runlevel=$(/bin/awk -F ':' '$3 == "initdefault" { print $2 }' /etc/inittab)
 +	[ -z "$runlevel" ] && runlevel="3"
 +	telinit $runlevel
  end script


Index: event-compat-sysv.spec
===================================================================
RCS file: /cvs/extras/rpms/event-compat-sysv/devel/event-compat-sysv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- event-compat-sysv.spec	4 Apr 2008 14:55:15 -0000	1.9
+++ event-compat-sysv.spec	4 Apr 2008 15:09:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           event-compat-sysv
 Version:        0.3.9
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Upstart events to emulate SysVInit
 
 Group:          System Environment/Base
@@ -76,7 +76,7 @@
 %doc COPYING
 
 %changelog
-* Fri Apr  4 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-12
+* Fri Apr  4 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-13
 - Go back to using /etc/inittab for default runlevel (reverts #432384)
 - Add respawn (and a limit) to prefdm (#440061)