summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorLuiz Souza <luiz@netgate.com>2017-09-19 16:37:26 -0500
committerLuiz Souza <luiz@netgate.com>2017-09-19 16:38:15 -0500
commitd988e0bbf991e28c611b194e9e6ccd99f818209b (patch)
tree43f44c4b015b7c5624531d3d77fd1ea7dcffa1d2 /src/etc
parentfd349773a20b5bea17a47d4b088cbd3c9bad6c3d (diff)
downloadpfsense-d988e0bbf991e28c611b194e9e6ccd99f818209b.zip
pfsense-d988e0bbf991e28c611b194e9e6ccd99f818209b.tar.gz
Only run swapon and rc.savecore when the SWAPDEVICE is valid.
Diffstat (limited to 'src/etc')
-rwxr-xr-xsrc/etc/pfSense-rc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/etc/pfSense-rc b/src/etc/pfSense-rc
index d5eca8a..09683ae 100755
--- a/src/etc/pfSense-rc
+++ b/src/etc/pfSense-rc
@@ -224,8 +224,10 @@ echo
/sbin/conscontrol mute off >/dev/null
SWAPDEVICE=`/bin/cat /etc/fstab | /usr/bin/grep swap | /usr/bin/cut -f1`
-/sbin/swapon -a 2>/dev/null >/dev/null
-/etc/rc.savecore
+if [ -n "${SWAPDEVICE}" ]; then
+ /sbin/swapon -a 2>/dev/null >/dev/null
+ /etc/rc.savecore
+fi
# 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
OpenPOWER on IntegriCloud