Update init script to work with current development version of OpenRC (checkroot -> root; checkfs -> fsck).

Package-Manager: portage-2.1.4.1

15 files changed, 55 insertions, 28 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 3de2261c9dd8..c69a743cbd2a 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.52 2008/01/31 01:57:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.53 2008/02/01 12:38:43 flameeyes Exp $
+
+  01 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> files/1.0.5-dmcrypt.rc:
+  Update init script to work with current development version of OpenRC
+  (checkroot -> root; checkfs -> fsck).
 
   31 Jan 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   cryptsetup-1.0.5-r1.ebuild:
diff --git a/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc b/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
index 399cc5bf65d1..e3439c6c6673 100644
--- a/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc,v 1.2 2007/10/02 15:47:27 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc,v 1.3 2008/02/01 12:38:44 flameeyes Exp $
 
 depend() {
-	before checkfs
+	before checkfs fsck
 	if [ -e /lib/librc.so ]; then
 	need device-mapper
 	fi
diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 27a3c59913af..9d91db60a432 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/device-mapper
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.103 2007/11/19 16:11:17 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.104 2008/02/01 12:39:47 flameeyes Exp $
+
+  01 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/device-mapper.rc-1.02.22-r3, files/device-mapper.rc:
+  Update init script to work with current development version of OpenRC
+  (checkroot -> root; checkfs -> fsck).
 
   19 Nov 2007; Jeroen Roovers <jer@gentoo.org>
   device-mapper-1.02.22-r5.ebuild:
diff --git a/sys-fs/device-mapper/files/device-mapper.rc b/sys-fs/device-mapper/files/device-mapper.rc
index 7c8a94002f28..1b40ee51b7c3 100644
--- a/sys-fs/device-mapper/files/device-mapper.rc
+++ b/sys-fs/device-mapper/files/device-mapper.rc
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc,v 1.2 2007/05/09 16:53:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc,v 1.3 2008/02/01 12:39:47 flameeyes Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this causes
 		# a dependency loop with checkroot (before *)
-		before checkroot
+		before checkroot root
 	fi
 }
 
diff --git a/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3 b/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3
index 052939ce5335..aef839d579c6 100644
--- a/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3
+++ b/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3
@@ -1,14 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3,v 1.4 2007/10/09 02:28:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3,v 1.5 2008/02/01 12:39:47 flameeyes Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this causes
 		# a dependency loop with checkroot (before *)
 		after modules
-		before checkfs
+		before checkfs fsck
 	fi
 }
 
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 12cde2b544d8..97c9acbec664 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.126 2008/01/30 14:37:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.127 2008/02/01 12:40:41 flameeyes Exp $
+
+  01 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/lvm.rc-2.02.28-r1, files/lvm.rc-2.02.28-r2, files/lvm.rc:
+  Update init script to work with current development version of OpenRC
+  (checkroot -> root; checkfs -> fsck).
 
 *lvm2-2.02.28-r5 (30 Jan 2008)
 
diff --git a/sys-fs/lvm2/files/lvm.rc b/sys-fs/lvm2/files/lvm.rc
index 0a0e749932d9..96d4cd9871e8 100644
--- a/sys-fs/lvm2/files/lvm.rc
+++ b/sys-fs/lvm2/files/lvm.rc
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc,v 1.1 2007/05/09 16:36:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc,v 1.2 2008/02/01 12:40:42 flameeyes Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this causes
 		# dependency-cycles with checkroot (before *)
-		before checkroot
+		before checkroot root
 	fi
 }
 
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.28-r1 b/sys-fs/lvm2/files/lvm.rc-2.02.28-r1
index 72f5861f4c78..a748877dc1d1 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.28-r1
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.28-r1
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.28-r1,v 1.1 2007/10/04 16:06:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.28-r1,v 1.2 2008/02/01 12:40:42 flameeyes Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this causes
 		# dependency-cycles with checkroot (before *)
-		before checkroot
+		before checkroot root
 	fi
 }
 
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.28-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.28-r2
index 34d223bd238d..97e470e6230f 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.28-r2
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.28-r2
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.28-r2,v 1.1 2007/10/08 21:11:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.28-r2,v 1.2 2008/02/01 12:40:42 flameeyes Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this causes
 		# dependency-cycles with checkroot (before *)
-		before checkfs
+		before checkfs fsck
 		after modules
 	fi
 }
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 9a3129f9ebd4..9e24783942b6 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/mdadm
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.85 2007/10/19 11:57:05 robbat2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.86 2008/02/01 12:42:12 flameeyes Exp $
+
+  01 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/mdraid.rc-2.6.3-r3, files/mdraid.rc-2.6.3-r4, files/mdraid.rc:
+  Update init script to work with current development version of OpenRC
+  (checkroot -> root; checkfs -> fsck).
 
 *mdadm-2.6.4 (19 Oct 2007)
 
diff --git a/sys-fs/mdadm/files/mdraid.rc b/sys-fs/mdadm/files/mdraid.rc
index 02da6655b297..0b53664f3103 100644
--- a/sys-fs/mdadm/files/mdraid.rc
+++ b/sys-fs/mdadm/files/mdraid.rc
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc,v 1.1 2007/10/02 22:02:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc,v 1.2 2008/02/01 12:42:12 flameeyes Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this could cause
 		# dependency-cycles with checkroot (before *)
-		before checkfs lvm
+		before checkfs fsck lvm
 	fi
 }
 
diff --git a/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3 b/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3
index 622c40b1faa2..dab6b70d18e7 100644
--- a/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3
+++ b/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3,v 1.1 2007/10/04 14:27:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3,v 1.2 2008/02/01 12:42:12 flameeyes Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this could cause
 		# dependency-cycles with checkroot (before *)
-		before checkfs
+		before checkfs fsck
 	fi
 }
 
diff --git a/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4 b/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4
index e637e7371ec4..de6cbd7646f6 100644
--- a/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4
+++ b/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4,v 1.1 2007/10/08 21:07:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4,v 1.2 2008/02/01 12:42:12 flameeyes Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this could cause
 		# dependency-cycles with checkroot (before *)
-		before checkfs
+		before checkfs fsck
 		after modules
 	fi
 }
diff --git a/sys-fs/trustees/ChangeLog b/sys-fs/trustees/ChangeLog
index 8a530a42df29..1950c2e05c2e 100644
--- a/sys-fs/trustees/ChangeLog
+++ b/sys-fs/trustees/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/trustees
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/trustees/ChangeLog,v 1.9 2007/04/28 13:25:06 tove Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/trustees/ChangeLog,v 1.10 2008/02/01 12:43:01 flameeyes Exp $
+
+  01 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> files/trustees.rc6:
+  Update init script to work with current development version of OpenRC
+  (checkroot -> root; checkfs -> fsck).
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> trustees-2.10.ebuild:
   Use newinitd and newconfd (#174266)
diff --git a/sys-fs/trustees/files/trustees.rc6 b/sys-fs/trustees/files/trustees.rc6
index 635a61d44d6f..230e757a1d4c 100644
--- a/sys-fs/trustees/files/trustees.rc6
+++ b/sys-fs/trustees/files/trustees.rc6
@@ -1,10 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/trustees/files/trustees.rc6,v 1.2 2004/07/15 01:00:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/trustees/files/trustees.rc6,v 1.3 2008/02/01 12:43:01 flameeyes Exp $
 
 depend() {
-	need checkfs
+	if [ -x /etc/init.d/fsck ]; then
+		need fsck
+	else
+		need checkfs
+	fi
 	before net
 }