rpms/event-compat-sysv/devel event-compat-sysv-rhmods.patch, NONE, 1.1 event-compat-sysv.spec, 1.6, 1.7 event-compat-sysv-mods.patch, 1.4, NONE

Casey Dahlin (sadmac) fedora-extras-commits at redhat.com
Mon Mar 17 03:59:39 UTC 2008 

Author: sadmac

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

Modified Files:
	event-compat-sysv.spec 
Added Files:
	event-compat-sysv-rhmods.patch 
Removed Files:
	event-compat-sysv-mods.patch 
Log Message:
Changed to MIT license, merged rc-default into rcS, and started ttys after prefdm


event-compat-sysv-rhmods.patch:

--- NEW FILE event-compat-sysv-rhmods.patch ---
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..ab362d0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,20 @@
+Copyright © 2008 Canonical Ltd.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/prefdm b/prefdm
new file mode 100644
index 0000000..e53d18d
--- /dev/null
+++ b/prefdm
@@ -0,0 +1,12 @@
+# prefdm - preferred display manager
+#
+# Starts gdm/xdm/etc by preference
+
+start on stopped rc5
+
+stop on runlevel [!5]
+
+console output
+script
+	exec /etc/X11/prefdm -nodaemon
+end script
diff --git a/rc-default b/rc-default
deleted file mode 100644
index 191763d..0000000
--- a/rc-default
+++ /dev/null
@@ -1,23 +0,0 @@
-# rc - runlevel compatibility
-#
-# This task guesses what the "default runlevel" should be and starts the
-# appropriate script.
-
-start on stopped rcS
-
-script
-	runlevel --reboot || true
-
-	if grep -q -w -- "-s\|single\|S" /proc/cmdline; then
-	    telinit S
-	elif [ -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
-end script
diff --git a/rc0 b/rc0
index 30fb087..63de616 100644
--- a/rc0
+++ b/rc0
@@ -21,5 +21,5 @@ script
 	    export PREVLEVEL RUNLEVEL
 	fi
 
-	exec /etc/init.d/rc 0
+	exec /etc/rc.d/rc 0
 end script
diff --git a/rc1 b/rc1
index b69e53a..35de4d3 100644
--- a/rc1
+++ b/rc1
@@ -15,5 +15,5 @@ script
 	    export PREVLEVEL RUNLEVEL
 	fi
 
-	exec /etc/init.d/rc 1
+	exec /etc/rc.d/rc 1
 end script
diff --git a/rc2 b/rc2
index 3ddaa8f..1e0ab67 100644
--- a/rc2
+++ b/rc2
@@ -16,5 +16,5 @@ script
 	    export PREVLEVEL RUNLEVEL
 	fi
 
-	exec /etc/init.d/rc 2
+	exec /etc/rc.d/rc 2
 end script
diff --git a/rc3 b/rc3
index aa02a1d..785c98a 100644
--- a/rc3
+++ b/rc3
@@ -16,5 +16,5 @@ script
 	    export PREVLEVEL RUNLEVEL
 	fi
 
-	exec /etc/init.d/rc 3
+	exec /etc/rc.d/rc 3
 end script
diff --git a/rc4 b/rc4
index 19977d6..590eebb 100644
--- a/rc4
+++ b/rc4
@@ -16,5 +16,5 @@ script
 	    export PREVLEVEL RUNLEVEL
 	fi
 
-	exec /etc/init.d/rc 4
+	exec /etc/rc.d/rc 4
 end script
diff --git a/rc5 b/rc5
index 4bb868b..69ca88a 100644
--- a/rc5
+++ b/rc5
@@ -16,5 +16,5 @@ script
 	    export PREVLEVEL RUNLEVEL
 	fi
 
-	exec /etc/init.d/rc 5
+	exec /etc/rc.d/rc 5
 end script
diff --git a/rc6 b/rc6
index 4927d90..c40f708 100644
--- a/rc6
+++ b/rc6
@@ -19,5 +19,5 @@ script
 	    export PREVLEVEL RUNLEVEL
 	fi
 
-	exec /etc/init.d/rc 6
+	exec /etc/rc.d/rc 6
 end script
diff --git a/rcS b/rcS
index c70b3ce..85cf76c 100644
--- a/rcS
+++ b/rcS
@@ -7,7 +7,7 @@ start on startup
 stop on runlevel
 
 # Note: there can be no previous runlevel here, if we have one it's bad
-# information (we enter rc1 not rcS for maintenance).  Run /etc/init.d/rc
+# information (we enter rc1 not rcS for maintenance).  Run /etc/rc.d/rc
 # without information so that it defaults to previous=N runlevel=S.
 console output
 script
@@ -20,5 +20,18 @@ script
 	#    export PREVLEVEL RUNLEVEL
 	#fi
 
-	exec /etc/init.d/rcS
+	/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
+	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 --git a/rcS-sulogin b/rcS-sulogin
index 40fd13a..ba5eea2 100644
--- a/rcS-sulogin
+++ b/rcS-sulogin
@@ -10,7 +10,7 @@ console owner
 
 script
 	runlevel --set S >/dev/null || true
-	/sbin/sulogin
+	/bin/bash
 
 	if [ -r /etc/inittab ]; then
 	    RL="$(sed -n -e "/^id:[0-9]*:initdefault:/{s/^id://;s/:.*//;p}" /etc/inittab || true)"
diff --git a/tty1 b/tty1
index 9f653b5..f0002ae 100644
--- a/tty1
+++ b/tty1
@@ -3,14 +3,14 @@
 # This service maintains a getty on tty1 from the point the system is
 # started until it is shut down again.
 
-start on runlevel 2
-start on runlevel 3
-start on runlevel 4
-start on runlevel 5
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on started prefdm
 
 stop on runlevel 0
 stop on runlevel 1
 stop on runlevel 6
 
 respawn
-exec /sbin/getty 38400 tty1
+exec /sbin/mingetty tty1
diff --git a/tty2 b/tty2
index 3f07f87..ec5f94c 100644
--- a/tty2
+++ b/tty2
@@ -3,14 +3,14 @@
 # This service maintains a getty on tty2 from the point the system is
 # started until it is shut down again.
 
-start on runlevel 2
-start on runlevel 3
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on started prefdm
 
 stop on runlevel 0
 stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
 stop on runlevel 6
 
 respawn
-exec /sbin/getty 38400 tty2
+exec /sbin/mingetty tty2
diff --git a/tty3 b/tty3
index b489222..ed95fdc 100644
--- a/tty3
+++ b/tty3
@@ -3,14 +3,14 @@
 # This service maintains a getty on tty3 from the point the system is
 # started until it is shut down again.
 
-start on runlevel 2
-start on runlevel 3
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on started prefdm
 
 stop on runlevel 0
 stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
 stop on runlevel 6
 
 respawn
-exec /sbin/getty 38400 tty3
+exec /sbin/mingetty tty3
diff --git a/tty4 b/tty4
index ea1783c..76b6d71 100644
--- a/tty4
+++ b/tty4
@@ -3,14 +3,14 @@
 # This service maintains a getty on tty4 from the point the system is
 # started until it is shut down again.
 
-start on runlevel 2
-start on runlevel 3
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on started prefdm
 
 stop on runlevel 0
 stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
 stop on runlevel 6
 
 respawn
-exec /sbin/getty 38400 tty4
+exec /sbin/mingetty tty4
diff --git a/tty5 b/tty5
index f218908..9e9d813 100644
--- a/tty5
+++ b/tty5
@@ -3,14 +3,14 @@
 # This service maintains a getty on tty5 from the point the system is
 # started until it is shut down again.
 
-start on runlevel 2
-start on runlevel 3
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on started prefdm
 
 stop on runlevel 0
 stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
 stop on runlevel 6
 
 respawn
-exec /sbin/getty 38400 tty5
+exec /sbin/mingetty tty5
diff --git a/tty6 b/tty6
index 1c5994e..7eb42c0 100644
--- a/tty6
+++ b/tty6
@@ -3,14 +3,14 @@
 # This service maintains a getty on tty6 from the point the system is
 # started until it is shut down again.
 
-start on runlevel 2
-start on runlevel 3
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on started prefdm
 
 stop on runlevel 0
 stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
 stop on runlevel 6
 
 respawn
-exec /sbin/getty 38400 tty6
+exec /sbin/mingetty tty6


Index: event-compat-sysv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/event-compat-sysv/devel/event-compat-sysv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- event-compat-sysv.spec	7 Mar 2008 18:11:37 -0000	1.6
+++ event-compat-sysv.spec	17 Mar 2008 03:59:04 -0000	1.7
@@ -1,22 +1,20 @@
 Name:           event-compat-sysv
 Version:        0.3.9
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Upstart events to emulate SysVInit
 
 Group:          System Environment/Base
-License:        GPLv2+
+License:        MIT
 URL:            http://upstart.ubuntu.com
-Source0:        http://upstart.ubuntu.com/download/example-jobs/0.3/example-jobs-%{version}.tar.gz
-Source1:	COPYING
-Patch0:		event-compat-sysv-mods.patch
+Source0:        http://upstart.ubuntu.com/download/example-jobs/0.3/example-jobs-0.3.9.tar.gz
+Patch0:         event-compat-sysv-rhmods.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildArch:      noarch
 
 Requires:       upstart >= %{version}
 
-Obsoletes:	sysvinit
-Provides:	SysVinit >= 2.83
-Provides:	sysvinit >= 2.83
+Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
+Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
 
 %description
 A series of upstart event handlers that supply a SysVInit compatible boot
@@ -25,7 +23,6 @@
 %prep
 %setup -q -c
 %patch0 -p1
-cp %{SOURCE1} .
 
 %build
 # At the moment its just a bunch of files
@@ -34,25 +31,24 @@
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/event.d
 
-cp control-alt-delete	%{buildroot}%{_sysconfdir}/event.d
-cp rc0			%{buildroot}%{_sysconfdir}/event.d
-cp rc1			%{buildroot}%{_sysconfdir}/event.d
-cp rc2			%{buildroot}%{_sysconfdir}/event.d
-cp rc3			%{buildroot}%{_sysconfdir}/event.d
-cp rc4			%{buildroot}%{_sysconfdir}/event.d
-cp rc5			%{buildroot}%{_sysconfdir}/event.d
-cp rc6			%{buildroot}%{_sysconfdir}/event.d
-cp rc-default		%{buildroot}%{_sysconfdir}/event.d
-cp rcS			%{buildroot}%{_sysconfdir}/event.d
-cp rcS-sulogin		%{buildroot}%{_sysconfdir}/event.d
-cp sulogin		%{buildroot}%{_sysconfdir}/event.d
-cp tty1			%{buildroot}%{_sysconfdir}/event.d
-cp tty2			%{buildroot}%{_sysconfdir}/event.d
-cp tty3			%{buildroot}%{_sysconfdir}/event.d
-cp tty4			%{buildroot}%{_sysconfdir}/event.d
-cp tty5			%{buildroot}%{_sysconfdir}/event.d
-cp tty6			%{buildroot}%{_sysconfdir}/event.d
-cp prefdm		%{buildroot}%{_sysconfdir}/event.d
+cp control-alt-delete %{buildroot}%{_sysconfdir}/event.d
+cp rc0                %{buildroot}%{_sysconfdir}/event.d
+cp rc1                %{buildroot}%{_sysconfdir}/event.d
+cp rc2                %{buildroot}%{_sysconfdir}/event.d
+cp rc3                %{buildroot}%{_sysconfdir}/event.d
+cp rc4                %{buildroot}%{_sysconfdir}/event.d
+cp rc5                %{buildroot}%{_sysconfdir}/event.d
+cp rc6                %{buildroot}%{_sysconfdir}/event.d
+cp rcS                %{buildroot}%{_sysconfdir}/event.d
+cp rcS-sulogin        %{buildroot}%{_sysconfdir}/event.d
+cp sulogin            %{buildroot}%{_sysconfdir}/event.d
+cp tty1               %{buildroot}%{_sysconfdir}/event.d
+cp tty2               %{buildroot}%{_sysconfdir}/event.d
+cp tty3               %{buildroot}%{_sysconfdir}/event.d
+cp tty4               %{buildroot}%{_sysconfdir}/event.d
+cp tty5               %{buildroot}%{_sysconfdir}/event.d
+cp tty6               %{buildroot}%{_sysconfdir}/event.d
+cp prefdm             %{buildroot}%{_sysconfdir}/event.d
 
 %clean
 rm -rf %{buildroot}
@@ -67,7 +63,6 @@
 %config(noreplace) %{_sysconfdir}/event.d/rc4
 %config(noreplace) %{_sysconfdir}/event.d/rc5
 %config(noreplace) %{_sysconfdir}/event.d/rc6
-%config(noreplace) %{_sysconfdir}/event.d/rc-default
 %config(noreplace) %{_sysconfdir}/event.d/rcS
 %config(noreplace) %{_sysconfdir}/event.d/rcS-sulogin
 %config(noreplace) %{_sysconfdir}/event.d/sulogin
@@ -81,6 +76,13 @@
 %doc COPYING
 
 %changelog
+* 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
+- Make ttys start after prefdm in runlevel 5
+- Fix obsoletes/provides badness
+- Merge rc-default into rcS
+
 * Fri Mar  7 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-9
 - Much as /etc/inittab was, these need to be %%config(noreplace)
 


--- event-compat-sysv-mods.patch DELETED ---

More information about the fedora-extras-commits mailing list