rpms/upstart/devel upstart-telinit.patch, NONE, 1.1 upstart.spec, 1.39, 1.40 events.5, 1.4, NONE upstart-fedora-buglist.patch, 1.3, NONE upstart-force-on-shutdown-reboot.patch, 1.1, NONE upstart-gcc43.patch, 1.1, NONE upstart-initctl-man.patch, 1.2, NONE upstart-rpm.patch, 1.3, NONE upstart-telinit-u.patch, 1.2, NONE upstart-tty-stack.patch, 1.4, NONE

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/upstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25792

Modified Files:
	upstart.spec 
Added Files:
	upstart-telinit.patch 
Removed Files:
	events.5 upstart-fedora-buglist.patch 
	upstart-force-on-shutdown-reboot.patch upstart-gcc43.patch 
	upstart-initctl-man.patch upstart-rpm.patch 
	upstart-telinit-u.patch upstart-tty-stack.patch 
Log Message:
Make 'telinit u' a no-op until state saving is implemented.

Remove some old dead patches.


upstart-telinit.patch:
 telinit.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE upstart-telinit.patch ---
diff -up upstart-0.6.3/util/telinit.c.foo upstart-0.6.3/util/telinit.c
--- upstart-0.6.3/util/telinit.c.foo	2009-12-03 14:52:58.000000000 -0500
+++ upstart-0.6.3/util/telinit.c	2009-12-03 14:53:06.000000000 -0500
@@ -174,9 +174,6 @@ main (int   argc,
 		break;
 	case 'U':
 	case 'u':
-		ret = kill (1, SIGTERM);
-		if (ret < 0)
-			nih_error_raise_system ();
 		break;
 	default:
 		nih_assert_not_reached ();


Index: upstart.spec
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- upstart.spec	27 Nov 2009 14:26:05 -0000	1.39
+++ upstart.spec	3 Dec 2009 20:00:00 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -9,6 +9,7 @@ URL:            http://upstart.ubuntu.co
 Source0:        http://upstart.ubuntu.com/download/0.6/upstart-%{version}.tar.bz2
 # remove tests which fail in koji
 Patch0:         upstart-remove-tests.patch
+Patch1:		upstart-telinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -23,6 +24,7 @@ during shutdown and supervising them whi
 %prep
 %setup -q
 %patch0 -p1 -b .tests
+%patch1 -p1 -b .u
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib}
@@ -101,6 +103,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Thu Dec  3 2009 Bill Nottingham <notting at redhat.com> 0.6.3-3
+- make 'telinit u' a no-op, temporarily
+
 * Fri Nov 27 2009 Petr Lautrbach <plautrba at redhat.com> 0.6.3-2
 - Removed tests which fail in koji
 


--- events.5 DELETED ---


--- upstart-fedora-buglist.patch DELETED ---


--- upstart-force-on-shutdown-reboot.patch DELETED ---


--- upstart-gcc43.patch DELETED ---


--- upstart-initctl-man.patch DELETED ---


--- upstart-rpm.patch DELETED ---


--- upstart-telinit-u.patch DELETED ---


--- upstart-tty-stack.patch DELETED ---