summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Susarret <evansus@gmail.com>2013-04-24 02:28:13 -0700
committerEvan Susarret <evansus@gmail.com>2013-04-24 02:28:13 -0700
commit2fb0d9ce31fee102beed3e096bb5a563ef4fb6d0 (patch)
tree24fb30d7540c99e0fa92487847d0f959a93fe402
parent3312d8afb71fd39e969730f91e38bf2eec34f957 (diff)
parent98304a9268ecfea6efde439575a06acb9f1dbe48 (diff)
downloadpfsense-2fb0d9ce31fee102beed3e096bb5a563ef4fb6d0.zip
pfsense-2fb0d9ce31fee102beed3e096bb5a563ef4fb6d0.tar.gz
Merge pull request #1 from evansus/patch-1
ZFSROOT not hardcoded to zpool or dataset 'tank'
-rwxr-xr-xetc/rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc b/etc/rc
index 70996d8..9546b73 100755
--- a/etc/rc
+++ b/etc/rc
@@ -68,9 +68,9 @@ echo "Mounting filesystems..."
# Handle ZFS read-only case
if [ "$PLATFORM" = "pfSense" ]; then
if [ -f /usr/bin/grep ]; then
- WHEREISROOT=`/sbin/mount | /usr/bin/grep " / " | /usr/bin/grep "tank" | /usr/bin/cut -d' ' -f1`
- if [ "$WHEREISROOT" != "" ]; then
- /sbin/zfs set readonly=off $WHEREISROOT
+ ZFSROOT=`/sbin/mount | /usr/bin/grep " / " | /usr/bin/awk -F ' on ' '{print $1}'`
+ if [ "$ZFSROOT" != "" ]; then
+ echo /sbin/zfs set readonly=off $ZFSROOT
fi
fi
fi
OpenPOWER on IntegriCloud