From c688523fcc88470906c8dd0357783c9918fafeda Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Mon, 16 Apr 2007 13:05:33 +0000
Subject: Punted the volumes init script. Volume handling will be handled by
 init script that can be run at any point, even before checkroot.

---
 ChangeLog                |  3 +++
 init.d.Linux/Makefile    |  2 +-
 init.d.Linux/volumes     | 42 ------------------------------------------
 runlevels.Linux/Makefile |  2 +-
 4 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100755 init.d.Linux/volumes

diff --git a/ChangeLog b/ChangeLog
index 33984e45..3869b0a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 
   16 Apr 2007; Roy Marples <uberlord@gentoo.org>:
 
+	Punted the volumes init script. Volume handling will be handled by
+	init script that can be run at any point, even before checkroot.
+
   	Don't search for a space after interface names in /proc/net, #174792
 	thanks to Mike Auty.
 
diff --git a/init.d.Linux/Makefile b/init.d.Linux/Makefile
index 286266d5..b8328d22 100644
--- a/init.d.Linux/Makefile
+++ b/init.d.Linux/Makefile
@@ -1,5 +1,5 @@
 DIR   = /etc/init.d
-EXES  = clock consolefont keymaps modules numlock volumes
+EXES  = clock consolefont keymaps modules numlock
 
 TOPDIR = ..
 include $(TOPDIR)/default.mk
diff --git a/init.d.Linux/volumes b/init.d.Linux/volumes
deleted file mode 100755
index 4f2a7f5e..00000000
--- a/init.d.Linux/volumes
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VOLUME_ORDER=${VOLUME_ORDER:-${RC_VOLUME_ORDER:-raid evms lvm dm}}
-
-# Dependancy information is in /etc/conf.d/volumes
-
-start() {
-	local x=
-
-	# Start our volumes, RAID, LVM, etc
-   	for x in ${VOLUME_ORDER} ; do
-		start_addon "${x}"
-   	done
-
-	# Setup dm-crypt mappings if any
-	start_addon dm-crypt
-
-	return 0
-}
-
-stop() {
-	local x= rev=
-
-	# Stop dm-crypt mappings if any
-	stop_addon dm-crypt
-	stop_addon truecrypt
-
-	# Stop our volumes, RAID, LVM, etc
-   	for x in ${VOLUME_ORDER} ; do
-		rev="${x} ${rev}"
-	done
-
-	for x in ${rev} ; do
-		stop_addon "${x}"
-   	done
-
-	return 0
-}
-
-# vim: set ts=4 :
diff --git a/runlevels.Linux/Makefile b/runlevels.Linux/Makefile
index aa84c1c0..ef2e44fb 100644
--- a/runlevels.Linux/Makefile
+++ b/runlevels.Linux/Makefile
@@ -1,4 +1,4 @@
-BOOT = consolefont keymaps modules net.lo volumes
+BOOT = consolefont keymaps modules net.lo
 DEFAULT = hdparm
 
 install:
-- 
cgit v1.2.3