[gentoo-commits] gentoo-x86 commit in sys-process/runit/files: 3 3-1.4

[gentoo-commits] gentoo-x86 commit in sys-process/runit/files: 3 3-1.4

[William Hubbs (williamh)]

williamh    14/04/10 19:18:50

  Modified:             3
  Removed:              3-1.4
  Log:
  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)

Revision  Changes    Path
1.2                  sys-process/runit/files/3

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/runit/files/3?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/runit/files/3?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/runit/files/3?r1=1.1&r2=1.2

Index: 3
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/runit/files/3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3	3 Mar 2005 16:08:25 -0000	1.1
+++ 3	10 Apr 2014 19:18:49 -0000	1.2
@@ -3,13 +3,12 @@
 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
-