rpms/event-compat-sysv/devel event-compat-sysv-rhmods.patch, 1.1, 1.2 event-compat-sysv.spec, 1.7, 1.8

Casey Dahlin (sadmac) fedora-extras-commits at redhat.com
Mon Mar 17 05:57:21 UTC 2008


Author: sadmac

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

Modified Files:
	event-compat-sysv-rhmods.patch event-compat-sysv.spec 
Log Message:
Remove reliance on /etc/inittab


event-compat-sysv-rhmods.patch:

Index: event-compat-sysv-rhmods.patch
===================================================================
RCS file: /cvs/pkgs/rpms/event-compat-sysv/devel/event-compat-sysv-rhmods.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- event-compat-sysv-rhmods.patch	17 Mar 2008 03:59:04 -0000	1.1
+++ event-compat-sysv-rhmods.patch	17 Mar 2008 05:57:15 -0000	1.2
@@ -149,10 +149,10 @@
 +	exec /etc/rc.d/rc 6
  end script
 diff --git a/rcS b/rcS
-index c70b3ce..85cf76c 100644
+index c70b3ce..b361de1 100644
 --- a/rcS
 +++ b/rcS
-@@ -7,7 +7,7 @@ start on startup
+@@ -7,18 +7,23 @@ start on startup
  stop on runlevel
  
  # Note: there can be no previous runlevel here, if we have one it's bad
@@ -161,18 +161,21 @@
  # without information so that it defaults to previous=N runlevel=S.
  console output
  script
-@@ -20,5 +20,18 @@ script
- 	#    export PREVLEVEL RUNLEVEL
- 	#fi
+ 	runlevel --set S >/dev/null || true
  
--	exec /etc/init.d/rcS
+-	#set $(runlevel --set S || true)
+-	#if [ "$1" != "unknown" ]; then
+-	#    PREVLEVEL=$1
+-	#    RUNLEVEL=$2
+-	#    export PREVLEVEL RUNLEVEL
+-	#fi
 +	/etc/rc.d/rc.sysinit 
 +	runlevel --reboot || true
-+
-+	RL="2"
-+	if [ -r /etc/inittab ]; then
-+	    RL="$(sed -n -e "/^id:[0-9]*:initdefault:/{s/^id://;s/:.*//;p}" /etc/inittab || true)"
-+	fi
++	. /etc/sysconfig/init
+ 
+-	exec /etc/init.d/rcS
++	RL="3"
++	[ "$GRAPHICAL" = "yes" ] && RL="5"
 +	for t in $(cat /proc/cmdline); do
 +		case $t in
 +			-s|single|S) RL="S" ;;


Index: event-compat-sysv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/event-compat-sysv/devel/event-compat-sysv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- event-compat-sysv.spec	17 Mar 2008 03:59:04 -0000	1.7
+++ event-compat-sysv.spec	17 Mar 2008 05:57:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           event-compat-sysv
 Version:        0.3.9
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Upstart events to emulate SysVInit
 
 Group:          System Environment/Base
@@ -76,6 +76,9 @@
 %doc COPYING
 
 %changelog
+* Mon Mar 18 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-11
+- Remove reliance on /etc/inittab
+
 * Sun Mar 17 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-10
 - Add MIT license copying file according to Scott's wishes and changed license
 - Change our mod patch name to event-compat-sysv-rhmods.patch




More information about the fedora-extras-commits mailing list