packages: upstart/pldize.patch, upstart/upstart.spec, upstart/start-ttys.co...

Tue Apr 20 20:11:12 CEST 2010

Author: glen                         Date: Tue Apr 20 18:11:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- refresh initscripts, inspired from rawhide cvs. works for me

---- Files affected:
packages/upstart:
   pldize.patch (1.1 -> 1.2) , upstart.spec (1.45 -> 1.46) , start-ttys.conf (NONE -> 1.1)  (NEW), tty.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/upstart/pldize.patch
diff -u packages/upstart/pldize.patch:1.1 packages/upstart/pldize.patch:1.2

--- packages/upstart/pldize.patch:1.1	Tue Apr 20 08:13:14 2010
+++ packages/upstart/pldize.patch	Tue Apr 20 20:11:05 2010
@@ -1,19 +1,12 @@
---- upstart-0.6.5/conf/rc.conf~	2009-10-23 23:47:27.000000000 +0300
-+++ upstart-0.6.5/conf/rc.conf	2010-04-20 08:02:17.867240857 +0300
-@@ -15,4 +15,4 @@
- task
+--- upstart-0.6.5/conf/Makefile.am~	2009-10-23 23:47:27.000000000 +0300
++++ upstart-0.6.5/conf/Makefile.am	2010-04-20 20:57:19.482479946 +0300
+@@ -2,7 +2,6 @@
  
- console output
--exec /etc/init.d/rc $RUNLEVEL
-+exec /etc/rc.d/rc $RUNLEVEL
---- upstart-0.6.5/conf/rc-sysinit.conf~	2010-02-04 05:58:39.000000000 +0200
-+++ upstart-0.6.5/conf/rc-sysinit.conf	2010-04-20 08:04:26.690246472 +0300
-@@ -51,7 +51,7 @@
-     done
- 
-     # Run the system initialisation scripts
--    [ -n "${FROM_SINGLE_USER_MODE}" ] || /etc/init.d/rcS
-+    [ -n "${FROM_SINGLE_USER_MODE}" ] || /etc/init.d/single start
- 
-     # Switch into the default runlevel
-     telinit "${DEFAULT_RUNLEVEL}"
+ initdir = $(sysconfdir)/init
+ dist_init_DATA = \
+-	rc-sysinit.conf \
+-	rc.conf \
+-	rcS.conf \
++	start-ttys.conf \
++	tty.conf \
+ 	control-alt-delete.conf

================================================================
Index: packages/upstart/upstart.spec
diff -u packages/upstart/upstart.spec:1.45 packages/upstart/upstart.spec:1.46
--- packages/upstart/upstart.spec:1.45	Tue Apr 20 08:13:14 2010
+++ packages/upstart/upstart.spec	Tue Apr 20 20:11:05 2010
@@ -9,13 +9,15 @@
 Summary(pl.UTF-8):	Oparty na zdarzeniach demon init
 Name:		upstart
 Version:	0.6.5
-Release:	1
+Release:	1.4
 License:	GPL v2
 Group:		Base
 Source0:	http://upstart.ubuntu.com/download/0.6/%{name}-%{version}.tar.gz
 # Source0-md5:	f9466bba72b655c2408353b64105853f
 URL:		http://upstart.ubuntu.com/
-Patch0:		rc-scripts-paths.patch
+Patch0:		pldize.patch
+Source1:	start-ttys.conf
+Source2:	tty.conf
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-devel >= 1.2.16-1
@@ -28,10 +30,11 @@
 BuildRequires:	pkgconfig
 Requires:	dbus-libs >= 1.2.14-2
 Suggests:	dbus
+Suggests:	vim-syntax-upstart
 Provides:	virtual(init-daemon)
 Obsoletes:	virtual(init-daemon)
 Conflicts:	dbus < 1.2.12-2
-Conflicts:	upstart-SysVinit < 2.86-23
+Conflicts:	upstart-SysVinit < 2.86-23.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir		/sbin
@@ -49,6 +52,8 @@
 %prep
 %setup -q
 %patch0 -p1
+cp -a %{SOURCE1} conf
+cp -a %{SOURCE2} conf
 
 %build
 %{__aclocal} -I m4
@@ -92,7 +97,9 @@
 %doc AUTHORS ChangeLog HACKING NEWS TODO
 /etc/dbus-1/system.d/Upstart.conf
 %dir %{_sysconfdir}/init
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/control-alt-delete.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/start-ttys.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/tty.conf
 %attr(755,root,root) %{_sbindir}/halt
 %attr(755,root,root) %{_sbindir}/init
 %attr(755,root,root) %{_sbindir}/initctl
@@ -116,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2010/04/20 18:11:05  glen
+- refresh initscripts, inspired from rawhide cvs. works for me
+
 Revision 1.45  2010/04/20 06:13:14  glen
 - fix some rc-scripts paths, kill init on 0.6 upgrade
 

================================================================
Index: packages/upstart/start-ttys.conf
diff -u /dev/null packages/upstart/start-ttys.conf:1.1
--- /dev/null	Tue Apr 20 20:11:12 2010
+++ packages/upstart/start-ttys.conf	Tue Apr 20 20:11:05 2010
@@ -0,0 +1,17 @@
+#
+# This service starts the configured number of gettys.
+
+start on stopped rc RUNLEVEL=[2345]
+
+env ACTIVE_CONSOLES=/dev/tty[1-6]
+env X_TTY=/dev/tty5
+task
+script
+	if [ -f /etc/sysconfig/system ]; then
+		. /etc/sysconfig/system
+	fi
+	for tty in $(echo $ACTIVE_CONSOLES) ; do
+		[ "$RUNLEVEL" = "5" -a "$tty" = "$X_TTY" ] && continue
+		initctl start tty TTY=$tty
+	done
+end script

================================================================
Index: packages/upstart/tty.conf
diff -u /dev/null packages/upstart/tty.conf:1.1
--- /dev/null	Tue Apr 20 20:11:12 2010
+++ packages/upstart/tty.conf	Tue Apr 20 20:11:05 2010
@@ -0,0 +1,9 @@
+# tty - getty
+#
+# This service maintains a getty on the sepcified device.
+
+stop on runlevel [016]
+
+respawn
+instance $TTY
+exec /sbin/mingetty $TTY
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/pldize.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/upstart.spec?r1=1.45&r2=1.46&f=u

