Deprecate nanobsd platform and remove all conditionals that uses it

1 files changed, 31 insertions, 73 deletions

diff --git a/src/etc/pfSense-rc b/src/etc/pfSense-rc
index 40d8d36..caa0316 100755
--- a/src/etc/pfSense-rc
+++ b/src/etc/pfSense-rc
@@ -32,9 +32,6 @@ HOME=/
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 export HOME PATH
 
-# Set our operating platform
-PLATFORM=`/bin/cat /etc/platform`
-
 # Set our current version
 version=`/bin/cat /etc/version`
 
@@ -56,11 +53,9 @@ product=$(/usr/local/bin/php -n /usr/local/sbin/read_global_var product_name pfS
 
 # Setup dumpdev/ddb/savecore"
 echo "Configuring crash dumps..."
-if [ "$PLATFORM" = "${product}" ]; then
-	/etc/rc.dumpon
-fi
+/etc/rc.dumpon
 
-# Setup ddb on all platforms. On full install it will save the dump, on NanoBSD it will print to console and auto-reboot.
+# Setup ddb on all platforms.
 if [ ! -z "`sysctl -Nq debug.ddb.scripting.scripts`" ]; then
 	/sbin/ddb /etc/ddb.conf
 fi
@@ -102,13 +97,6 @@ while [ ${mount_rc} -ne 0 -a ${attempts} -lt 3 ]; do
 	attempts=$((attempts+1))
 done
 
-if [ "${PLATFORM}" = "nanobsd" ]; then
-	# XXX This script does need all filesystems rw!!!!
-	# Put this workaround for now until better ways are found.
-	/sbin/mount -u -w -o sync,noatime /
-	/sbin/mount -u -w -o sync,noatime /cf
-fi
-
 # If /conf is a directory, convert it to a symlink to /cf/conf
 if [ -d "/conf" ]; then
 	# If item is not a symlink then rm and recreate
@@ -121,26 +109,22 @@ fi
 
 USE_MFS_TMPVAR=$(/usr/local/sbin/read_xml_tag.sh boolean system/use_mfs_tmpvar)
 unset MOVE_PKG_DATA
-if [ "$PLATFORM" = "${product}" ]; then
-	# If use MFS var is disabled, move files back to place
-	if [ "${USE_MFS_TMPVAR}" != "true" -a -f /root/var/db/pkg/local.sqlite ]; then
-		MOVE_PKG_DATA=1
-		rm -rf /var/db/pkg 2>/dev/null
-		rm -rf /var/cache/pkg 2>/dev/null
-		mv /root/var/db/pkg /var/db
-		mv /root/var/cache/pkg /var/cache
-	# If use MFS var is enabled, move files to a safe place
-	elif [ "${USE_MFS_TMPVAR}" = "true" -a -f /var/db/pkg/local.sqlite ]; then
-		MOVE_PKG_DATA=1
-		/bin/mkdir -p /root/var/db /root/var/cache
-		mv /var/db/pkg /root/var/db
-		mv /var/cache/pkg /root/var/cache
-	fi
-elif [ "${PLATFORM}" = "nanobsd" ]; then
+# If use MFS var is disabled, move files back to place
+if [ "${USE_MFS_TMPVAR}" != "true" -a -f /root/var/db/pkg/local.sqlite ]; then
+	MOVE_PKG_DATA=1
+	rm -rf /var/db/pkg 2>/dev/null
+	rm -rf /var/cache/pkg 2>/dev/null
+	mv /root/var/db/pkg /var/db
+	mv /root/var/cache/pkg /var/cache
+# If use MFS var is enabled, move files to a safe place
+elif [ "${USE_MFS_TMPVAR}" = "true" -a -f /var/db/pkg/local.sqlite ]; then
 	MOVE_PKG_DATA=1
+	/bin/mkdir -p /root/var/db /root/var/cache
+	mv /var/db/pkg /root/var/db
+	mv /var/cache/pkg /root/var/cache
 fi
 
-if [ "${PLATFORM}" = "nanobsd" ] || [ "${USE_MFS_TMPVAR}" = "true" ]; then
+if [ "${USE_MFS_TMPVAR}" = "true" ]; then
 	/etc/rc.embedded
 fi
 
@@ -158,23 +142,16 @@ fi
 /bin/rm -f /root/TRIM_set
 /bin/rm -f /root/TRIM_unset
 
-if [ "${PLATFORM}" = "nanobsd" ]; then
-	/sbin/kldstat -qm zfs
-	if [ $? -eq 0 ]; then
+# Handle ZFS read-only case
+/sbin/kldstat -qm zfs
+if [ $? -eq 0 ]; then
+	ZFSFSAVAILABLE=$(/sbin/zfs mount 2>/dev/null | wc -l)
+	if [ $ZFSFSAVAILABLE -eq 0 ]; then
 		/sbin/kldunload zfs
-	fi
-elif [ "$PLATFORM" = "${product}" ]; then
-	# Handle ZFS read-only case
-	/sbin/kldstat -qm zfs
-	if [ $? -eq 0 ]; then
-		ZFSFSAVAILABLE=$(/sbin/zfs mount 2>/dev/null | wc -l)
-		if [ $ZFSFSAVAILABLE -eq 0 ]; then
-			/sbin/kldunload zfs
-		elif [ -f /usr/bin/grep ]; then
-			ZFSROOT=`/sbin/zfs mount | /usr/bin/grep ' /$' | /usr/bin/cut -d ' ' -f 1`
-			if [ "$ZFSROOT" != "" ]; then
-				/sbin/zfs set readonly=off $ZFSROOT
-			fi
+	elif [ -f /usr/bin/grep ]; then
+		ZFSROOT=`/sbin/zfs mount | /usr/bin/grep ' /$' | /usr/bin/cut -d ' ' -f 1`
+		if [ "$ZFSROOT" != "" ]; then
+			/sbin/zfs set readonly=off $ZFSROOT
 		fi
 	fi
 fi
@@ -194,7 +171,7 @@ fi
 # Use php -n here because we are not ready to load extensions yet
 varrunpath=$(/usr/local/bin/php -n /usr/local/sbin/read_global_var varrun_path "/var/run")
 
-if [ "$PLATFORM" = "${product}" ] && [ "${USE_MFS_TMPVAR}" != "true" ]; then
+if [ "${USE_MFS_TMPVAR}" != "true" ]; then
 	/sbin/mdmfs -S -M -s 4m md $varrunpath
 fi
 
@@ -207,18 +184,13 @@ echo
 
 /sbin/conscontrol mute off >/dev/null
 
-if [ "$PLATFORM" = "${product}" ]; then
-	SWAPDEVICE=`/bin/cat /etc/fstab | /usr/bin/grep swap | /usr/bin/cut -f1`
-	/sbin/swapon -a 2>/dev/null >/dev/null
-	/etc/rc.savecore
-fi
+SWAPDEVICE=`/bin/cat /etc/fstab | /usr/bin/grep swap | /usr/bin/cut -f1`
+/sbin/swapon -a 2>/dev/null >/dev/null
+/etc/rc.savecore
 
 # make some directories in /var
 /bin/mkdir -p $varrunpath /var/log /var/etc /var/db/entropy /var/db/rrd /var/at/jobs/ /var/empty /var/log/nginx 2>/dev/null
 /bin/rm -rf $varrunpath/*
-if [ "$PLATFORM" != "${product}" ]; then
-	/bin/rm /var/log/* 2>/dev/null
-fi
 
 # Cleanup configuration files from previous instance
 /bin/rm -rf /var/etc/*
@@ -369,15 +341,8 @@ ln -sf /etc/ssl/openssl.cnf \
 /etc/rc.php_ini_setup 2>/tmp/php_errors.txt
 /usr/local/sbin/php-fpm -c /usr/local/etc/php.ini -y /usr/local/lib/php-fpm.conf -RD 2>&1 >/dev/null
 
-# Launch external configuration loader for supported platforms
-if [ "$PLATFORM" = "nanobsd" ]; then
-	/usr/local/sbin/fcgicli -f /etc/ecl.php
-fi
-
-# Launch external configuration loader for supported platforms
-if [ "$PLATFORM" = "${product}" ]; then
-	/usr/local/sbin/fcgicli -f /etc/ecl.php
-fi
+# Launch external configuration loader
+/usr/local/sbin/fcgicli -f /etc/ecl.php
 
 if [ -f /etc/rc.custom_boot_early ]; then
 	/bin/echo -n "Launching /etc/rc.custom_boot_early...";
@@ -393,13 +358,6 @@ echo -n "Launching the init system..."
 /bin/rm -f /cf/conf/backup/backup.cache
 /usr/bin/touch $varrunpath/booting
 
-if [ "${PLATFORM}" = "nanobsd" ]; then
-	# XXX This script does need all filesystems rw!!!!
-	# Put this workaround for now until better ways are found.
-	/sbin/mount -u -f -r -o sync,noatime /
-	/sbin/mount -u -f -r -o sync,noatime /cf
-fi
-
 # Copy custom logo over if it's present
 if [ -d /usr/local/share/${product}/custom_logos ]; then
 	cp -f /usr/local/share/${product}/custom_logos/*png \
@@ -448,7 +406,7 @@ fi
 # Log product version to syslog
 BUILDTIME=`cat /etc/version.buildtime`
 ARCH=`uname -m`
-echo "$product ($PLATFORM) ${version}${version_patch} $ARCH $BUILDTIME"
+echo "$product ${version}${version_patch} $ARCH $BUILDTIME"
 
 echo "Bootup complete"