rpms/event-compat-sysv/devel event-compat-sysv-rhmods.patch, 1.2, 1.3 event-compat-sysv.spec, 1.8, 1.9
Bill Nottingham (notting)
fedora-extras-commits at redhat.com
Fri Apr 4 14:55:21 UTC 2008
Author: notting
Update of /cvs/extras/rpms/event-compat-sysv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9922
Modified Files:
event-compat-sysv-rhmods.patch event-compat-sysv.spec
Log Message:
Go back to using inittab, rather than roll-our-own config.
Add respawn to prefdm.
event-compat-sysv-rhmods.patch:
Index: event-compat-sysv-rhmods.patch
===================================================================
RCS file: /cvs/extras/rpms/event-compat-sysv/devel/event-compat-sysv-rhmods.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- event-compat-sysv-rhmods.patch 17 Mar 2008 05:57:15 -0000 1.2
+++ event-compat-sysv-rhmods.patch 4 Apr 2008 14:55:15 -0000 1.3
@@ -1,8 +1,6 @@
-diff --git a/COPYING b/COPYING
-new file mode 100644
-index 0000000..ab362d0
---- /dev/null
-+++ b/COPYING
+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
@@ -0,0 +1,20 @@
+Copyright © 2008 Canonical Ltd.
+
@@ -24,11 +22,9 @@
+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
+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
@@ -0,0 +1,12 @@
+# prefdm - preferred display manager
+#
@@ -39,42 +35,12 @@
+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
++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
@@ -21,5 +21,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -82,10 +48,9 @@
- 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
+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
export PREVLEVEL RUNLEVEL
fi
@@ -93,10 +58,9 @@
- 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
+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
@@ -16,5 +16,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -104,10 +68,9 @@
- 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
+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
@@ -16,5 +16,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -115,10 +78,9 @@
- 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
+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
@@ -16,5 +16,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -126,10 +88,9 @@
- 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
+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
@@ -16,5 +16,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -137,10 +98,9 @@
- 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
+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
@@ -19,5 +19,5 @@ script
export PREVLEVEL RUNLEVEL
fi
@@ -148,11 +108,11 @@
- exec /etc/init.d/rc 6
+ exec /etc/rc.d/rc 6
end script
-diff --git a/rcS b/rcS
-index c70b3ce..b361de1 100644
---- a/rcS
-+++ b/rcS
-@@ -7,18 +7,23 @@ start on startup
+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
stop on runlevel
# Note: there can be no previous runlevel here, if we have one it's bad
@@ -171,36 +131,45 @@
- #fi
+ /etc/rc.d/rc.sysinit
+ runlevel --reboot || true
-+ . /etc/sysconfig/init
- exec /etc/init.d/rcS
-+ RL="3"
-+ [ "$GRAPHICAL" = "yes" ] && RL="5"
++ runlevel=$(/bin/awk -F ':' '/^id:/ { print $2 }' /etc/inittab)
++ [ -z "$runlevel" ] && runlevel="3"
+ for t in $(cat /proc/cmdline); do
+ case $t in
-+ -s|single|S) RL="S" ;;
-+ [1-9]) RL="$t" ;;
++ -s|single|S) runlevel="S" ;;
++ [1-9]) runlevel="$t" ;;
+ esac
+ done
-+ telinit $RL
++ telinit $runlevel
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
+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
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
+- if [ -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
++ runlevel=$(/bin/awk -F ':' '/^id:/ { print $2 }' /etc/inittab)
++ [ -z "$runlevel" ] && runlevel="3"
++ 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
@@ -3,14 +3,14 @@
# This service maintains a getty on tty1 from the point the system is
# started until it is shut down again.
@@ -221,10 +190,9 @@
respawn
-exec /sbin/getty 38400 tty1
+exec /sbin/mingetty tty1
-diff --git a/tty2 b/tty2
-index 3f07f87..ec5f94c 100644
---- a/tty2
-+++ b/tty2
+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
@@ -3,14 +3,14 @@
# This service maintains a getty on tty2 from the point the system is
# started until it is shut down again.
@@ -245,10 +213,9 @@
respawn
-exec /sbin/getty 38400 tty2
+exec /sbin/mingetty tty2
-diff --git a/tty3 b/tty3
-index b489222..ed95fdc 100644
---- a/tty3
-+++ b/tty3
+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
@@ -3,14 +3,14 @@
# This service maintains a getty on tty3 from the point the system is
# started until it is shut down again.
@@ -269,10 +236,9 @@
respawn
-exec /sbin/getty 38400 tty3
+exec /sbin/mingetty tty3
-diff --git a/tty4 b/tty4
-index ea1783c..76b6d71 100644
---- a/tty4
-+++ b/tty4
+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
@@ -3,14 +3,14 @@
# This service maintains a getty on tty4 from the point the system is
# started until it is shut down again.
@@ -293,10 +259,9 @@
respawn
-exec /sbin/getty 38400 tty4
+exec /sbin/mingetty tty4
-diff --git a/tty5 b/tty5
-index f218908..9e9d813 100644
---- a/tty5
-+++ b/tty5
+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
@@ -3,14 +3,14 @@
# This service maintains a getty on tty5 from the point the system is
# started until it is shut down again.
@@ -317,10 +282,9 @@
respawn
-exec /sbin/getty 38400 tty5
+exec /sbin/mingetty tty5
-diff --git a/tty6 b/tty6
-index 1c5994e..7eb42c0 100644
---- a/tty6
-+++ b/tty6
+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
@@ -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/devel/event-compat-sysv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- event-compat-sysv.spec 17 Mar 2008 05:57:15 -0000 1.8
+++ event-compat-sysv.spec 4 Apr 2008 14:55:15 -0000 1.9
@@ -1,6 +1,6 @@
Name: event-compat-sysv
Version: 0.3.9
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Upstart events to emulate SysVInit
Group: System Environment/Base
@@ -76,6 +76,10 @@
%doc COPYING
%changelog
+* Fri Apr 4 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-12
+- Go back to using /etc/inittab for default runlevel (reverts #432384)
+- Add respawn (and a limit) to prefdm (#440061)
+
* Mon Mar 18 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-11
- Remove reliance on /etc/inittab
More information about the fedora-extras-commits
mailing list