rpms/event-compat-sysv/F-9 event-compat-sysv-rhmods.patch, 1.4, 1.5 event-compat-sysv.spec, 1.10, 1.11
Bill Nottingham (notting)
fedora-extras-commits at redhat.com
Thu Apr 24 19:42:01 UTC 2008
Author: notting
Update of /cvs/extras/rpms/event-compat-sysv/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv490/F-9
Modified Files:
event-compat-sysv-rhmods.patch event-compat-sysv.spec
Log Message:
Use post-stop to avoid spurious 'rcS killed...' messages (#444001)
event-compat-sysv-rhmods.patch:
Index: event-compat-sysv-rhmods.patch
===================================================================
RCS file: /cvs/extras/rpms/event-compat-sysv/F-9/event-compat-sysv-rhmods.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- event-compat-sysv-rhmods.patch 4 Apr 2008 15:09:27 -0000 1.4
+++ event-compat-sysv-rhmods.patch 24 Apr 2008 19:41:25 -0000 1.5
@@ -1,6 +1,6 @@
diff -up /dev/null event-compat-sysv-0.3.9/COPYING
---- /dev/null 2008-04-03 21:11:04.850005448 -0400
-+++ event-compat-sysv-0.3.9/COPYING 2008-04-04 10:14:44.000000000 -0400
+--- /dev/null 2008-04-22 20:31:19.652004933 -0400
++++ event-compat-sysv-0.3.9/COPYING 2008-04-24 15:33:46.000000000 -0400
@@ -0,0 +1,20 @@
+Copyright © 2008 Canonical Ltd.
+
@@ -23,8 +23,8 @@
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -up /dev/null event-compat-sysv-0.3.9/prefdm
---- /dev/null 2008-04-03 21:11:04.850005448 -0400
-+++ event-compat-sysv-0.3.9/prefdm 2008-04-04 10:14:44.000000000 -0400
+--- /dev/null 2008-04-22 20:31:19.652004933 -0400
++++ event-compat-sysv-0.3.9/prefdm 2008-04-24 15:33:46.000000000 -0400
@@ -0,0 +1,12 @@
+# prefdm - preferred display manager
+#
@@ -38,9 +38,9 @@
+respawn
+respawn limit 10 120
+exec /etc/X11/prefdm -nodaemon
-diff -up event-compat-sysv-0.3.9/rc0.rhmods event-compat-sysv-0.3.9/rc0
---- event-compat-sysv-0.3.9/rc0.rhmods 2007-02-08 18:35:02.000000000 -0500
-+++ event-compat-sysv-0.3.9/rc0 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/rc0.foo event-compat-sysv-0.3.9/rc0
+--- event-compat-sysv-0.3.9/rc0.foo 2007-02-08 18:35:02.000000000 -0500
++++ event-compat-sysv-0.3.9/rc0 2008-04-24 15:33:46.000000000 -0400
@@ -21,5 +21,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -48,19 +48,34 @@
- exec /etc/init.d/rc 0
+ exec /etc/rc.d/rc 0
end script
-diff -up event-compat-sysv-0.3.9/rc1.rhmods event-compat-sysv-0.3.9/rc1
---- event-compat-sysv-0.3.9/rc1.rhmods 2007-02-08 18:35:02.000000000 -0500
-+++ event-compat-sysv-0.3.9/rc1 2008-04-04 10:14:44.000000000 -0400
-@@ -15,5 +15,5 @@ script
+diff -up event-compat-sysv-0.3.9/rc1.foo event-compat-sysv-0.3.9/rc1
+--- event-compat-sysv-0.3.9/rc1.foo 2007-02-08 18:35:02.000000000 -0500
++++ event-compat-sysv-0.3.9/rc1 2008-04-24 15:34:04.000000000 -0400
+@@ -1,6 +1,9 @@
+ # rc1 - runlevel 1 compatibility
+ #
+ # This task runs the old sysv-rc runlevel 1 ("single-user") scripts.
++# /etc/rc.d/rc 1 will run the /etc/rc.d/rc1.d scripts.
++# telinit S will run whichever task has "start on runlevel S",
++# normally /etc/event.d/rcS-sulogin
+
+ start on runlevel 1
+
+@@ -15,5 +18,10 @@ script
export PREVLEVEL RUNLEVEL
fi
- exec /etc/init.d/rc 1
+ exec /etc/rc.d/rc 1
++end script
++post-stop script
++ clear
++ echo "Telling INIT to go to single user mode."
++ exec telinit S
end script
-diff -up event-compat-sysv-0.3.9/rc2.rhmods event-compat-sysv-0.3.9/rc2
---- event-compat-sysv-0.3.9/rc2.rhmods 2007-02-08 18:35:02.000000000 -0500
-+++ event-compat-sysv-0.3.9/rc2 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/rc2.foo event-compat-sysv-0.3.9/rc2
+--- event-compat-sysv-0.3.9/rc2.foo 2007-02-08 18:35:02.000000000 -0500
++++ event-compat-sysv-0.3.9/rc2 2008-04-24 15:33:46.000000000 -0400
@@ -16,5 +16,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -68,9 +83,9 @@
- exec /etc/init.d/rc 2
+ exec /etc/rc.d/rc 2
end script
-diff -up event-compat-sysv-0.3.9/rc3.rhmods event-compat-sysv-0.3.9/rc3
---- event-compat-sysv-0.3.9/rc3.rhmods 2007-02-08 18:35:03.000000000 -0500
-+++ event-compat-sysv-0.3.9/rc3 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/rc3.foo event-compat-sysv-0.3.9/rc3
+--- event-compat-sysv-0.3.9/rc3.foo 2007-02-08 18:35:03.000000000 -0500
++++ event-compat-sysv-0.3.9/rc3 2008-04-24 15:33:46.000000000 -0400
@@ -16,5 +16,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -78,9 +93,9 @@
- exec /etc/init.d/rc 3
+ exec /etc/rc.d/rc 3
end script
-diff -up event-compat-sysv-0.3.9/rc4.rhmods event-compat-sysv-0.3.9/rc4
---- event-compat-sysv-0.3.9/rc4.rhmods 2007-02-08 18:35:03.000000000 -0500
-+++ event-compat-sysv-0.3.9/rc4 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/rc4.foo event-compat-sysv-0.3.9/rc4
+--- event-compat-sysv-0.3.9/rc4.foo 2007-02-08 18:35:03.000000000 -0500
++++ event-compat-sysv-0.3.9/rc4 2008-04-24 15:33:46.000000000 -0400
@@ -16,5 +16,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -88,9 +103,9 @@
- exec /etc/init.d/rc 4
+ exec /etc/rc.d/rc 4
end script
-diff -up event-compat-sysv-0.3.9/rc5.rhmods event-compat-sysv-0.3.9/rc5
---- event-compat-sysv-0.3.9/rc5.rhmods 2007-02-08 18:35:03.000000000 -0500
-+++ event-compat-sysv-0.3.9/rc5 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/rc5.foo event-compat-sysv-0.3.9/rc5
+--- event-compat-sysv-0.3.9/rc5.foo 2007-02-08 18:35:03.000000000 -0500
++++ event-compat-sysv-0.3.9/rc5 2008-04-24 15:33:46.000000000 -0400
@@ -16,5 +16,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -98,9 +113,9 @@
- exec /etc/init.d/rc 5
+ exec /etc/rc.d/rc 5
end script
-diff -up event-compat-sysv-0.3.9/rc6.rhmods event-compat-sysv-0.3.9/rc6
---- event-compat-sysv-0.3.9/rc6.rhmods 2007-02-08 18:35:04.000000000 -0500
-+++ event-compat-sysv-0.3.9/rc6 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/rc6.foo event-compat-sysv-0.3.9/rc6
+--- event-compat-sysv-0.3.9/rc6.foo 2007-02-08 18:35:04.000000000 -0500
++++ event-compat-sysv-0.3.9/rc6 2008-04-24 15:33:46.000000000 -0400
@@ -19,5 +19,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -108,11 +123,10 @@
- exec /etc/init.d/rc 6
+ exec /etc/rc.d/rc 6
end script
-diff -up event-compat-sysv-0.3.9/rc-default.rhmods event-compat-sysv-0.3.9/rc-default
-diff -up event-compat-sysv-0.3.9/rcS.rhmods event-compat-sysv-0.3.9/rcS
---- event-compat-sysv-0.3.9/rcS.rhmods 2007-02-08 18:35:04.000000000 -0500
-+++ event-compat-sysv-0.3.9/rcS 2008-04-04 10:19:36.000000000 -0400
-@@ -7,18 +7,22 @@ start on startup
+diff -up event-compat-sysv-0.3.9/rcS.foo event-compat-sysv-0.3.9/rcS
+--- event-compat-sysv-0.3.9/rcS.foo 2007-02-08 18:35:04.000000000 -0500
++++ event-compat-sysv-0.3.9/rcS 2008-04-24 15:33:56.000000000 -0400
+@@ -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
@@ -129,10 +143,12 @@
- # RUNLEVEL=$2
- # export PREVLEVEL RUNLEVEL
- #fi
+-
+- exec /etc/init.d/rcS
+ /etc/rc.d/rc.sysinit
+ runlevel --reboot || true
-
-- exec /etc/init.d/rcS
++end script
++post-stop script
+ runlevel=$(/bin/awk -F ':' '$3 == "initdefault" { print $2 }' /etc/inittab)
+ [ -z "$runlevel" ] && runlevel="3"
+ for t in $(cat /proc/cmdline); do
@@ -141,18 +157,28 @@
+ [1-9]) runlevel="$t" ;;
+ esac
+ done
-+ telinit $runlevel
++ exec telinit $runlevel
end script
-diff -up event-compat-sysv-0.3.9/rcS-sulogin.rhmods event-compat-sysv-0.3.9/rcS-sulogin
---- event-compat-sysv-0.3.9/rcS-sulogin.rhmods 2007-02-08 18:35:04.000000000 -0500
-+++ event-compat-sysv-0.3.9/rcS-sulogin 2008-04-04 10:19:30.000000000 -0400
-@@ -10,16 +10,9 @@ console owner
+diff -up event-compat-sysv-0.3.9/rcS-sulogin.foo event-compat-sysv-0.3.9/rcS-sulogin
+--- event-compat-sysv-0.3.9/rcS-sulogin.foo 2007-02-08 18:35:04.000000000 -0500
++++ event-compat-sysv-0.3.9/rcS-sulogin 2008-04-24 15:33:58.000000000 -0400
+@@ -1,25 +1,19 @@
+ # rcS-sulogin - "single-user" runlevel compatibility
+ #
+-# This task runs the sulogin binary during "single-user" mode.
++# This task runs /bin/bash during "single-user" mode,
++# then continues to the default runlevel.
+ start on runlevel S
+
+ stop on runlevel
+
+ 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)"
- if [ -n "$RL" ]; then
@@ -163,13 +189,16 @@
- else
- telinit 2
- fi
++ /bin/bash || true
++end script
++post-stop script
+ runlevel=$(/bin/awk -F ':' '$3 == "initdefault" { print $2 }' /etc/inittab)
+ [ -z "$runlevel" ] && runlevel="3"
-+ telinit $runlevel
++ exec telinit $runlevel
end script
-diff -up event-compat-sysv-0.3.9/tty1.rhmods event-compat-sysv-0.3.9/tty1
---- event-compat-sysv-0.3.9/tty1.rhmods 2007-03-09 16:30:22.000000000 -0500
-+++ event-compat-sysv-0.3.9/tty1 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/tty1.foo event-compat-sysv-0.3.9/tty1
+--- event-compat-sysv-0.3.9/tty1.foo 2007-03-09 16:30:22.000000000 -0500
++++ event-compat-sysv-0.3.9/tty1 2008-04-24 15:33:46.000000000 -0400
@@ -3,14 +3,14 @@
# This service maintains a getty on tty1 from the point the system is
# started until it is shut down again.
@@ -190,9 +219,9 @@
respawn
-exec /sbin/getty 38400 tty1
+exec /sbin/mingetty tty1
-diff -up event-compat-sysv-0.3.9/tty2.rhmods event-compat-sysv-0.3.9/tty2
---- event-compat-sysv-0.3.9/tty2.rhmods 2007-03-09 16:30:25.000000000 -0500
-+++ event-compat-sysv-0.3.9/tty2 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/tty2.foo event-compat-sysv-0.3.9/tty2
+--- event-compat-sysv-0.3.9/tty2.foo 2007-03-09 16:30:25.000000000 -0500
++++ event-compat-sysv-0.3.9/tty2 2008-04-24 15:33:46.000000000 -0400
@@ -3,14 +3,14 @@
# This service maintains a getty on tty2 from the point the system is
# started until it is shut down again.
@@ -213,9 +242,9 @@
respawn
-exec /sbin/getty 38400 tty2
+exec /sbin/mingetty tty2
-diff -up event-compat-sysv-0.3.9/tty3.rhmods event-compat-sysv-0.3.9/tty3
---- event-compat-sysv-0.3.9/tty3.rhmods 2007-03-09 16:30:30.000000000 -0500
-+++ event-compat-sysv-0.3.9/tty3 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/tty3.foo event-compat-sysv-0.3.9/tty3
+--- event-compat-sysv-0.3.9/tty3.foo 2007-03-09 16:30:30.000000000 -0500
++++ event-compat-sysv-0.3.9/tty3 2008-04-24 15:33:46.000000000 -0400
@@ -3,14 +3,14 @@
# This service maintains a getty on tty3 from the point the system is
# started until it is shut down again.
@@ -236,9 +265,9 @@
respawn
-exec /sbin/getty 38400 tty3
+exec /sbin/mingetty tty3
-diff -up event-compat-sysv-0.3.9/tty4.rhmods event-compat-sysv-0.3.9/tty4
---- event-compat-sysv-0.3.9/tty4.rhmods 2007-03-09 16:30:35.000000000 -0500
-+++ event-compat-sysv-0.3.9/tty4 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/tty4.foo event-compat-sysv-0.3.9/tty4
+--- event-compat-sysv-0.3.9/tty4.foo 2007-03-09 16:30:35.000000000 -0500
++++ event-compat-sysv-0.3.9/tty4 2008-04-24 15:33:46.000000000 -0400
@@ -3,14 +3,14 @@
# This service maintains a getty on tty4 from the point the system is
# started until it is shut down again.
@@ -259,9 +288,9 @@
respawn
-exec /sbin/getty 38400 tty4
+exec /sbin/mingetty tty4
-diff -up event-compat-sysv-0.3.9/tty5.rhmods event-compat-sysv-0.3.9/tty5
---- event-compat-sysv-0.3.9/tty5.rhmods 2007-03-09 16:30:39.000000000 -0500
-+++ event-compat-sysv-0.3.9/tty5 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/tty5.foo event-compat-sysv-0.3.9/tty5
+--- event-compat-sysv-0.3.9/tty5.foo 2007-03-09 16:30:39.000000000 -0500
++++ event-compat-sysv-0.3.9/tty5 2008-04-24 15:33:46.000000000 -0400
@@ -3,14 +3,14 @@
# This service maintains a getty on tty5 from the point the system is
# started until it is shut down again.
@@ -282,9 +311,9 @@
respawn
-exec /sbin/getty 38400 tty5
+exec /sbin/mingetty tty5
-diff -up event-compat-sysv-0.3.9/tty6.rhmods event-compat-sysv-0.3.9/tty6
---- event-compat-sysv-0.3.9/tty6.rhmods 2007-03-09 16:30:44.000000000 -0500
-+++ event-compat-sysv-0.3.9/tty6 2008-04-04 10:14:44.000000000 -0400
+diff -up event-compat-sysv-0.3.9/tty6.foo event-compat-sysv-0.3.9/tty6
+--- event-compat-sysv-0.3.9/tty6.foo 2007-03-09 16:30:44.000000000 -0500
++++ event-compat-sysv-0.3.9/tty6 2008-04-24 15:33:46.000000000 -0400
@@ -3,14 +3,14 @@
# This service maintains a getty on tty6 from the point the system is
# started until it is shut down again.
Index: event-compat-sysv.spec
===================================================================
RCS file: /cvs/extras/rpms/event-compat-sysv/F-9/event-compat-sysv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- event-compat-sysv.spec 4 Apr 2008 15:09:27 -0000 1.10
+++ event-compat-sysv.spec 24 Apr 2008 19:41:25 -0000 1.11
@@ -1,6 +1,6 @@
Name: event-compat-sysv
Version: 0.3.9
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Upstart events to emulate SysVInit
Group: System Environment/Base
@@ -76,6 +76,10 @@
%doc COPYING
%changelog
+* Thu Apr 24 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-14
+- Rework rc1, rcS, rcS-sulogin to use post-stop to avoid spurious
+ 'rcS killed' messages (#444001)
+
* 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)
More information about the fedora-extras-commits
mailing list