diff options
| author |   William Hubbs <williamh@gentoo.org> | 2014-04-10 19:18:50 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2014-04-10 19:18:50 +0000 |
| commit | 3c3d2de6134cf7ea70770f1a02e2e64e8caf0ee9 (patch) | |
| tree | 878a5373cab8e856e611b2147196ca4ebe92c64d /sys-process | |
| parent | Drop pax-mark, add warning message concerning adobe-flash, bug #496908 commen... (diff) | |
| download | gentoo-2-3c3d2de6134cf7ea70770f1a02e2e64e8caf0ee9.tar.gz gentoo-2-3c3d2de6134cf7ea70770f1a02e2e64e8caf0ee9.tar.bz2 gentoo-2-3c3d2de6134cf7ea70770f1a02e2e64e8caf0ee9.zip | |
Merge the changes from 3-1.4 into 3 since pre 1.4 runit has been removed from the tree for several years.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8568F528)
Diffstat (limited to 'sys-process')
| -rw-r--r-- | sys-process/runit/ChangeLog | 7 | ||||
| -rwxr-xr-x | sys-process/runit/files/3 | 5 | ||||
| -rwxr-xr-x | sys-process/runit/files/3-1.4 | 14 | ||||
| -rw-r--r-- | sys-process/runit/runit-2.1.1-r1.ebuild | 5 |
4 files changed, 10 insertions, 21 deletions
diff --git a/sys-process/runit/ChangeLog b/sys-process/runit/ChangeLog index e14a24a39b47..5bf96f8c85e9 100644 --- a/sys-process/runit/ChangeLog +++ b/sys-process/runit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-process/runit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.47 2014/04/09 16:00:51 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.48 2014/04/10 19:18:50 williamh Exp $ + + 10 Apr 2014; William Hubbs <williamh@gentoo.org> -files/3-1.4, files/3, + runit-2.1.1-r1.ebuild: + Merge the changes from 3-1.4 into 3 since pre 1.4 runit has been removed from + the tree for several years. 09 Apr 2014; William Hubbs <williamh@gentoo.org> -runit-1.7.0.ebuild: remove old version diff --git a/sys-process/runit/files/3 b/sys-process/runit/files/3 index 182151e723d0..f143f5f46011 100755 --- a/sys-process/runit/files/3 +++ b/sys-process/runit/files/3 @@ -3,13 +3,12 @@ exec >/dev/console 2>&1 PATH=/sbin:/usr/sbin:/bin:/usr/bin echo 'Waiting for getties to stop...' -svwaitdown -xk -t10 /var/service/getty-* +sv shutdown -w 10 /var/service/getty-* echo 'Waiting for services to stop...' -svwaitdown -xk -t300 /var/service/* +sv shutdown -w 300 /var/service/* echo 'Shutdown...' test -x /etc/runit/reboot && LAST=6 || LAST=0 test -x /etc/runit/reboot && RC=reboot || RC=shutdown RUNLEVEL=$LAST /sbin/rc $RC - diff --git a/sys-process/runit/files/3-1.4 b/sys-process/runit/files/3-1.4 deleted file mode 100755 index f143f5f46011..000000000000 --- a/sys-process/runit/files/3-1.4 +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -exec >/dev/console 2>&1 -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -echo 'Waiting for getties to stop...' -sv shutdown -w 10 /var/service/getty-* - -echo 'Waiting for services to stop...' -sv shutdown -w 300 /var/service/* - -echo 'Shutdown...' -test -x /etc/runit/reboot && LAST=6 || LAST=0 -test -x /etc/runit/reboot && RC=reboot || RC=shutdown -RUNLEVEL=$LAST /sbin/rc $RC diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r1.ebuild index e65491b6b02e..e6356568c212 100644 --- a/sys-process/runit/runit-2.1.1-r1.ebuild +++ b/sys-process/runit/runit-2.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1-r1.ebuild,v 1.12 2014/03/19 13:47:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1-r1.ebuild,v 1.13 2014/04/10 19:18:50 williamh Exp $ EAPI="3" @@ -46,8 +46,7 @@ src_install() { doman man/*.[18] exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die + doexe "${FILESDIR}"/{1,2,3,ctrlaltdel} || die for tty in tty1 tty2 tty3 tty4 tty5 tty6; do exeinto /etc/runit/runsvdir/all/getty-$tty/ for script in run finish; do |