aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Thoumie <flz@FreeBSD.org>2006-08-22 11:12:09 +0000
committerFlorent Thoumie <flz@FreeBSD.org>2006-08-22 11:12:09 +0000
commit94733fef16c1059a169c1efbe3b403a3b3e927ae (patch)
treeddda26cb53ead9883c1f553b0c9417e034d9a92a
parent2b46c64c9c1bf1cb194e0f2b7c478f61a0e10cd9 (diff)
downloadsrc-94733fef16c1059a169c1efbe3b403a3b3e927ae.tar.gz
src-94733fef16c1059a169c1efbe3b403a3b3e927ae.zip
- Remove ramdisk rc.d scripts since they've been replaced by mdconfig{,2}.
- Update ObsoleteFiles.inc. Approved by: cperciva (mentor)
Notes
Notes: svn path=/head/; revision=161529
-rw-r--r--ObsoleteFiles.inc3
-rwxr-xr-xetc/rc.d/Makefile2
-rw-r--r--etc/rc.d/ramdisk68
-rw-r--r--etc/rc.d/ramdisk-own56
4 files changed, 4 insertions, 125 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index cc65308afce5..e3eb2f269956 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20060822: ramdisk{,-own} have been replaced by mdconfig{,2}
+OLD_FILES+=etc/rc.d/ramdisk
+OLD_FILES+=etc/rc.d/ramdisk-own
# 20060704: KAME compat file net_osdep.h removed
OLD_FILES+=usr/include/net/net_osdep.h
# 20060517: pcvt removed
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 4d58771df4ce..f89db2ade7d1 100755
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -30,7 +30,7 @@ FILES= DAEMON LOGIN NETWORKING SERVERS \
pf pflog pfsync \
powerd power_profile ppp pppoed pwcheck \
quota \
- ramdisk ramdisk-own random rarpd resolv root \
+ random rarpd resolv root \
route6d routed routing rpcbind rtadvd rwho \
savecore sdpd securelevel sendmail \
serial sppp swap1 \
diff --git a/etc/rc.d/ramdisk b/etc/rc.d/ramdisk
deleted file mode 100644
index 3ac0c42a3b21..000000000000
--- a/etc/rc.d/ramdisk
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh -
-#
-# Copyright (c) 2004 The FreeBSD Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: ramdisk
-# REQUIRE: localswap
-# BEFORE: mountcritlocal
-
-. /etc/rc.subr
-
-name="ramdisk"
-stop_cmd="ramdisk_stop"
-start_cmd="ramdisk_start"
-
-ramdisk_start()
-{
- for unit in $ramdisk_units; do
- eval mdoptions=\$ramdisk_${unit}_config
- if [ "$mdoptions" = "${mdoptions##-t}" ]; then
- echo "Type not specified for md$unit"
- continue
- fi
- eval fsoptions=\$ramdisk_${unit}_newfs
-
- mdconfig -a $mdoptions -u $unit
- newfs $fsoptions /dev/md$unit
- done
-}
-
-ramdisk_stop()
-{
- for unit in $ramdisk_units
- do
- if [ -c /dev/md$unit ]; then
- umount -f /dev/md$unit > /dev/null 2>&1
- mdconfig -d -u $unit
- fi
- done
-}
-
-load_rc_config $name
-run_rc_command "$1"
-
diff --git a/etc/rc.d/ramdisk-own b/etc/rc.d/ramdisk-own
deleted file mode 100644
index 2e2017cc90a8..000000000000
--- a/etc/rc.d/ramdisk-own
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh -
-#
-# Copyright (c) 2004 The FreeBSD Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: ramdisk-own
-# REQUIRE: ramdisk mountcritlocal
-# BEFORE: SERVERS
-
-. /etc/rc.subr
-
-name="ramdisk"
-stop_cmd=":"
-start_cmd="ramdisk_own_start"
-
-ramdisk_own_start()
-{
- for unit in $ramdisk_units; do
- device="/dev/md$unit"
- dir=`mount | grep $device | cut -d' ' -f3`
-
- eval owner=\$ramdisk_${unit}_owner
- eval perms=\$ramdisk_${unit}_perms
-
- [ "X$owner" != "X" ] && chown -f "$owner" $device $dir
- [ "X$perms" != "X" ] && chmod -f "$perms" /dev/md$unit $dir
- done
-}
-
-load_rc_config $name
-run_rc_command "$1"
-