Author: glen Date: Tue Apr 20 18:10:35 2010 GMT Module: packages Tag: HEAD ---- Log message: - refresh initscripts, inspired from rawhide cvs. works for me
---- Files affected: packages/upstart-SysVinit: upstart-SysVinit.spec (1.16 -> 1.17) , rc.conf (NONE -> 1.1) (NEW), rcS-sulogin.conf (NONE -> 1.1) (NEW), rcS.conf (NONE -> 1.1) (NEW), upstart-SysVinit-rc0.event (1.1 -> NONE) (REMOVED), upstart-SysVinit-rc1.event (1.1 -> NONE) (REMOVED), upstart-SysVinit-rc2.event (1.1 -> NONE) (REMOVED), upstart-SysVinit-rc3.event (1.1 -> NONE) (REMOVED), upstart-SysVinit-rc4.event (1.1 -> NONE) (REMOVED), upstart-SysVinit-rc5.event (1.1 -> NONE) (REMOVED), upstart-SysVinit-rc6.event (1.1 -> NONE) (REMOVED), upstart-SysVinit-sulogin.event (1.1 -> NONE) (REMOVED), upstart-SysVinit-tty1.event (1.6 -> NONE) (REMOVED), upstart-SysVinit-tty2.event (1.5 -> NONE) (REMOVED), upstart-SysVinit-tty3.event (1.5 -> NONE) (REMOVED), upstart-SysVinit-tty4.event (1.5 -> NONE) (REMOVED), upstart-SysVinit-tty5.event (1.5 -> NONE) (REMOVED), upstart-SysVinit-tty6.event (1.5 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/upstart-SysVinit/upstart-SysVinit.spec diff -u packages/upstart-SysVinit/upstart-SysVinit.spec:1.16 packages/upstart-SysVinit/upstart-SysVinit.spec:1.17 --- packages/upstart-SysVinit/upstart-SysVinit.spec:1.16 Tue Apr 20 06:59:55 2010 +++ packages/upstart-SysVinit/upstart-SysVinit.spec Tue Apr 20 20:10:28 2010 @@ -7,26 +7,15 @@ Summary(pl.UTF-8): Wsparcie dla System V w upstart Name: upstart-SysVinit Version: 2.86 -Release: 23 +Release: 23.2 License: GPL Group: Base Source0: ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz # Source0-md5: 7d5d61c026122ab791ac04c8a84db967 Source1: sysvinit.logrotate -Source5: %{name}-rc0.event -Source6: %{name}-rc1.event -Source7: %{name}-rc2.event -Source8: %{name}-rc3.event -Source9: %{name}-rc4.event -Source10: %{name}-rc5.event -Source11: %{name}-rc6.event -Source13: %{name}-sulogin.event -Source14: %{name}-tty1.event -Source15: %{name}-tty2.event -Source16: %{name}-tty3.event -Source17: %{name}-tty4.event -Source18: %{name}-tty5.event -Source19: %{name}-tty6.event +Source2: rc.conf +Source3: rcS.conf +Source4: rcS-sulogin.conf Patch0: sysvinit-paths.patch Patch1: sysvinit-bequiet.patch Patch2: sysvinit-md5-bigendian.patch @@ -51,8 +40,8 @@ Requires(pre): /usr/sbin/groupadd Requires: /bin/awk Requires: grep -Requires: login %{?with_selinux:Requires: libselinux >= 1.18} +Requires: login Requires: mingetty Requires: sed Requires: upstart >= 0.6 @@ -171,21 +160,10 @@ rm $RPM_BUILD_ROOT%{_mandir}/*man8/{init,poweroff,reboot,runlevel,shutdown,telinit}.8* rm $RPM_BUILD_ROOT%{_mandir}/*man5/inittab.5* -# provide default copatibility events -cp -a %{SOURCE5} $RPM_BUILD_ROOT%{eventdir}/rc0.conf -cp -a %{SOURCE6} $RPM_BUILD_ROOT%{eventdir}/rc1.conf -cp -a %{SOURCE7} $RPM_BUILD_ROOT%{eventdir}/rc2.conf -cp -a %{SOURCE8} $RPM_BUILD_ROOT%{eventdir}/rc3.conf -cp -a %{SOURCE9} $RPM_BUILD_ROOT%{eventdir}/rc4.conf -cp -a %{SOURCE10} $RPM_BUILD_ROOT%{eventdir}/rc5.conf -cp -a %{SOURCE11} $RPM_BUILD_ROOT%{eventdir}/rc6.conf -cp -a %{SOURCE13} $RPM_BUILD_ROOT%{eventdir}/sulogin.conf -cp -a %{SOURCE14} $RPM_BUILD_ROOT%{eventdir}/tty1.conf -cp -a %{SOURCE15} $RPM_BUILD_ROOT%{eventdir}/tty2.conf -cp -a %{SOURCE16} $RPM_BUILD_ROOT%{eventdir}/tty3.conf -cp -a %{SOURCE17} $RPM_BUILD_ROOT%{eventdir}/tty4.conf -cp -a %{SOURCE18} $RPM_BUILD_ROOT%{eventdir}/tty5.conf -cp -a %{SOURCE19} $RPM_BUILD_ROOT%{eventdir}/tty6.conf +# provide default compatibility events +cp -a %{SOURCE2} $RPM_BUILD_ROOT%{eventdir} +cp -a %{SOURCE3} $RPM_BUILD_ROOT%{eventdir} +cp -a %{SOURCE4} $RPM_BUILD_ROOT%{eventdir} %clean rm -rf $RPM_BUILD_ROOT @@ -211,7 +189,9 @@ %files %defattr(644,root,root,755) %doc doc/{Propaganda,Changelog,*.lsm} -%config(noreplace) %verify(not md5 mtime size) %{eventdir}/*.conf +%config(noreplace) %verify(not md5 mtime size) %{eventdir}/rc.conf +%config(noreplace) %verify(not md5 mtime size) %{eventdir}/rcS.conf +%config(noreplace) %verify(not md5 mtime size) %{eventdir}/rcS-sulogin.conf %attr(755,root,root) /bin/mountpoint %attr(755,root,root) %{_sbindir}/* %attr(755,root,root) %{_bindir}/last @@ -240,6 +220,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.17 2010/04/20 18:10:28 glen +- refresh initscripts, inspired from rawhide cvs. works for me + Revision 1.16 2010/04/20 04:59:55 glen - drop conflicting man5/inittab.5 with upstart; rel 23 ================================================================ Index: packages/upstart-SysVinit/rc.conf diff -u /dev/null packages/upstart-SysVinit/rc.conf:1.1 --- /dev/null Tue Apr 20 20:10:35 2010 +++ packages/upstart-SysVinit/rc.conf Tue Apr 20 20:10:28 2010 @@ -0,0 +1,14 @@ +# rc - System V runlevel compatibility +# +# This task runs the old sysv-rc runlevel scripts. It +# is usually started by the telinit compatibility wrapper. + +start on runlevel [0123456] + +stop on runlevel [!$RUNLEVEL] + +task + +export RUNLEVEL +console output +exec /etc/rc.d/rc $RUNLEVEL ================================================================ Index: packages/upstart-SysVinit/rcS-sulogin.conf diff -u /dev/null packages/upstart-SysVinit/rcS-sulogin.conf:1.1 --- /dev/null Tue Apr 20 20:10:35 2010 +++ packages/upstart-SysVinit/rcS-sulogin.conf Tue Apr 20 20:10:28 2010 @@ -0,0 +1,20 @@ +# rcS-sulogin - "single-user" runlevel compatibility +# +# This task runs /bin/sh during "single-user" mode, +# then continues to the default runlevel. + +start on runlevel S + +stop on runlevel [!S] + +console owner +script + exec /bin/sh +end script +post-stop script + if [ "$RUNLEVEL" = "S" ]; then + runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) + [ -z "$runlevel" ] && runlevel="3" + exec telinit $runlevel + fi +end script ================================================================ Index: packages/upstart-SysVinit/rcS.conf diff -u /dev/null packages/upstart-SysVinit/rcS.conf:1.1 --- /dev/null Tue Apr 20 20:10:35 2010 +++ packages/upstart-SysVinit/rcS.conf Tue Apr 20 20:10:28 2010 @@ -0,0 +1,28 @@ +# rcS - runlevel compatibility +# +# This task runs the old sysv-rc startup scripts. + +start on startup + +stop on runlevel + +task + +# 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/rc.d/rc +# without information so that it defaults to previous=N runlevel=S. +console output +exec /etc/rc.d/rc.sysinit +post-stop script + if [ "$UPSTART_EVENTS" = "startup" ]; then + runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) + [ -z "$runlevel" ] && runlevel="3" + for t in $(cat /proc/cmdline); do + case $t in + -s|single|S|s) runlevel="S" ;; + [1-9]) runlevel="$t" ;; + esac + done + exec telinit $runlevel + fi +end script ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart-SysVinit/upstart-SysVinit.spec?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
