From dd64811a99efb9caa82d48559cc73ed31f7809e1 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 7 Jul 2008 01:11:16 +0000
Subject: [PATCH] It appears that malloc options have changed for RELENG_7.

Eliminate old aj options.
---
 etc/rc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/etc/rc b/etc/rc
index c4ebabdf87..bd878935df 100755
--- a/etc/rc
+++ b/etc/rc
@@ -120,9 +120,12 @@ fi
 # Make sure our /tmp is 777
 chmod 1777 /tmp
 
-# Malloc debugging check
-if [ ! -L /etc/malloc.conf ]; then
-    ln -s aj /etc/malloc.conf
+if [ ! "$PLATFORM" = "cdrom" ] ; then
+	# Malloc debugging check
+	if [ -L /etc/malloc.conf ]; then
+	    #ln -s aj /etc/malloc.conf
+		rm /etc/malloc.conf
+	fi
 fi
 
 if [ ! -L /etc/dhclient.conf ]; then