From 2eab5dbaffed318f0c92d60747faa062ca4ca7c8 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Fri, 3 Jul 2009 18:38:25 -0400
Subject: [PATCH] Sync with master

---
 etc/rc.embedded | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/etc/rc.embedded b/etc/rc.embedded
index 1ff1678a0e..b55e1eb6bf 100755
--- a/etc/rc.embedded
+++ b/etc/rc.embedded
@@ -3,33 +3,27 @@
 # rc.embedded - embedded system specific startup information
 # For pfSense
 
-# Size of memory file system /conf partition
-partsize="3m"
+# Size of /tmp
+tmpsize="40m"
+
+# Size of /var
+varsize="20m"
 
-echo -n "Setting up embedded specific environment..."
 # Run some initialization routines
 [ -f /etc/rc.d/uzip ] && /etc/rc.d/uzip start
 
-if [ -f /nanobuild ]; then
-# Init /etc and /var, /tmp to point towards /var/tmp
-# All these to be done by rc.initdiskless
-    sh /etc/rc.initdiskless
-else
+echo -n "Setting up embedded specific environment..."
 # Initialize MFS for /tmp. Partly taken from /etc/rc.d/var
-    if (/bin/mkdir -p /tmp/.diskless 2> /dev/null); then
+if (/bin/mkdir -p /tmp/.diskless 2> /dev/null); then
 	rmdir /tmp/.diskless
-    else
-        varsize="40m"
-	mdmfs -S -M -s ${varsize} md /tmp
-    fi
-
+else
+	mdmfs -S -M -s ${tmpsize} md /tmp
+fi
 # Initialize MFS for /var. Partly taken from /etc/rc.d/var
-    if (/bin/mkdir -p /var/.diskless 2> /dev/null); then
+if (/bin/mkdir -p /var/.diskless 2> /dev/null); then
 	rmdir /var/.diskless
-    else
-        varsize="20m"
+else
 	mdmfs -S -M -s ${varsize} md /var
-    fi
 fi
 
 # Create some needed directories