summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2008-07-07 01:11:16 +0000
committerScott Ullrich <sullrich@pfsense.org>2008-07-07 01:11:16 +0000
commitdd64811a99efb9caa82d48559cc73ed31f7809e1 (patch)
tree19681a47c3cfa5542a9bc57e9bb90e8161357a12
parentaef749ebf7601a50be0a8176982159d8863c04ac (diff)
downloadpfsense-dd64811a99efb9caa82d48559cc73ed31f7809e1.zip
pfsense-dd64811a99efb9caa82d48559cc73ed31f7809e1.tar.gz
It appears that malloc options have changed for RELENG_7.
Eliminate old aj options.
-rwxr-xr-xetc/rc9
1 files changed, 6 insertions, 3 deletions
diff --git a/etc/rc b/etc/rc
index c4ebabd..bd87893 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
OpenPOWER on IntegriCloud