diff options
| author | Roy Marples <roy@marples.name> | 2007-04-16 13:05:33 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-04-16 13:05:33 +0000 |
| commit | c688523fcc88470906c8dd0357783c9918fafeda (patch) | |
| tree | 18b5e7803ebfa0283f4194aac0ffd18c44e44f79 | |
| parent | 757b8bcc968fa285e3d78435e30b6c47abc048dc (diff) | |
Punted the volumes init script. Volume handling will be handled by
init script that can be run at any point, even before checkroot.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | init.d.Linux/Makefile | 2 | ||||
| -rwxr-xr-x | init.d.Linux/volumes | 42 | ||||
| -rw-r--r-- | runlevels.Linux/Makefile | 2 |
4 files changed, 5 insertions, 44 deletions
@@ -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: |