From c1626f0e9d4289e261ed5a0032b2a4c48c457558 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Sun, 29 Apr 2012 10:54:43 -0500
Subject: [PATCH] Also consider /boot/loader.conf.local when updating
 vfs.root.mountfrom

---
 beadm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/beadm b/beadm
index 278fabf..baf9321 100755
--- a/beadm
+++ b/beadm
@@ -152,7 +152,9 @@ case ${1} in
         }
         zfs set mountpoint=${MNT} ${POOL}/ROOT/${2}
         cp /boot/zfs/zpool.cache ${MNT}/boot/zfs/zpool.cache
-        sed -i '' -E s/"^vfs.root.mountfrom=.*$"/"vfs.root.mountfrom=\"zfs:${POOL}\/ROOT\/${2##*/}\""/g ${MNT}/boot/loader.conf
+        LOADER_CONFIGS=${MNT}/boot/loader.conf
+        [ -f ${MNT}/boot/loader.conf.local ] && LOADER_CONFIGS="${LOADER_CONFIGS} ${MNT}/boot/loader.conf.local"
+        sed -i '' -E s/"^vfs.root.mountfrom=.*$"/"vfs.root.mountfrom=\"zfs:${POOL}\/ROOT\/${2##*/}\""/g ${LOADER_CONFIGS}
         zfs set mountpoint=legacy ${POOL}/ROOT/${2}
       }
       zpool set bootfs=${POOL}/ROOT/${2} ${POOL} && {