summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrbgarga <garga@FreeBSD.org>2013-04-30 08:32:48 -0700
committerrbgarga <garga@FreeBSD.org>2013-04-30 08:32:48 -0700
commit0d0cda1879a4c594a17b6429813ff700885680b6 (patch)
treeeae5dca92a9230506bb6200e5c6a2806ff3268f1
parent5d4429496e3da59cd14ec5c2bc1fffe75ca11f0b (diff)
parent453966f4ef0efb13a3e0927a73f3767d0c2f0d41 (diff)
downloadpfsense-0d0cda1879a4c594a17b6429813ff700885680b6.zip
pfsense-0d0cda1879a4c594a17b6429813ff700885680b6.tar.gz
Merge pull request #602 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 dd58e59..c4885a5 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/zfs mount | /usr/bin/grep ' /$' | /usr/bin/cut -d ' ' -f 1`
+ if [ "$ZFSROOT" != "" ]; then
+ echo /sbin/zfs set readonly=off $ZFSROOT
fi
fi
fi
OpenPOWER on IntegriCloud