From e57466a1c3fb2fd71576a797944c262f7e83c3c4 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Wed, 10 Feb 1999 18:08:16 +0000
Subject: Use /etc/defaults/rc.conf everywhere, falling back to /etc/rc.conf as
 necessary (for half-assed upgrades).

---
 etc/rc.d/diskless | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'etc/rc.d/diskless')

diff --git a/etc/rc.d/diskless b/etc/rc.d/diskless
index ddd52fc..a7f0a50 100644
--- a/etc/rc.d/diskless
+++ b/etc/rc.d/diskless
@@ -3,9 +3,10 @@
 # REQUIRE: initdiskless mountcritlocal
 	if [ -n "$4" ]; then
 		bpi="-i $4"
-
-if [ -f /etc/rc.conf ]; then
-        . /etc/rc.conf
+if [ -f /etc/defaults/rc.conf ]; then
+	/sbin/mdconfig -a -t malloc -s $1 -u $3
+elif [ -f /etc/rc.conf ]; then
+	/sbin/mount /dev/md$3c $2
 }
 
 mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
-- 
cgit v1.1