Move livecd routines to rc.cdrom.

1 files changed, 5 insertions, 19 deletions

diff --git a/etc/rc b/etc/rc
index e0f4b52..eacc6ab 100755
--- a/etc/rc
+++ b/etc/rc
@@ -23,19 +23,15 @@ version=`cat /etc/version`
 # Set our operating platform
 PLATFORM=`cat /etc/platform`
 
-if [ "$PLATFORM" = "cdrom" ]; then
-    /etc/rc.d/freesbie_1st
-    if [ ! -f /cf/conf ]; then
-	mkdir -p /cf/conf
-	/rescue/cp /FreeSBIE/cf/conf/* /cf/conf/
-    fi
-    /bin/sh /scripts/pfi start
-fi
-
 echo
 echo "Welcome to pfSense ${version} on the '${PLATFORM}' platform..."
 echo
 
+if [ "$PLATFORM" = "cdrom" ]; then
+	echo "Running CDROM routines..."
+	/etc/rc.cdrom
+fi
+
 /sbin/mount -a || fsck -y && mount -a
 if [ ! "$PLATFORM" = "cdrom" ]; then
     SWAPDEVICE=`cat /etc/fstab | grep swap | cut -f1`
@@ -70,15 +66,6 @@ fi
 
 [ ! -d /cf/conf/backup/ ] || mkdir -p /cf/conf/backup/ 2>/dev/null
 
-if [ "$PLATFORM" = "cdrom" ]; then
-    if [ ! -L /conf ]; then
-	/rescue/ln -s /cf/conf /conf
-    fi
-    [ ! -f /cf/conf/config.xml ] || /rescue/cp /FreeSBIE/cf/conf/config.xml /cf/conf/
-    [ ! -f /cf/conf/ez-ipupdate.cache ] || /rescue/cp /FreeSBIE/cf/conf/ez-ipupdate.cache /cf/conf/
-    mkdir /var/db/
-fi
-
 set -T
 trap "echo 'Reboot interrupted'; exit 1" 3
 
@@ -161,4 +148,3 @@ fi
 echo "Bootup complete"
 
 exit 0
-