[PC-BSD Commits] r2431 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-07-23 15:21:41 -0700 (Wed, 23 Jul 2008)
New Revision: 2431

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Fixed a bug with vfs.mountroot line using incorrect name for ZFS



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-23 21:04:53 UTC (rev 2430)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-23 22:21:41 UTC (rev 2431)
@@ -147,8 +147,9 @@
 then
 
   ZFSROOT="`cat /uzip/ZFS-root`"
+  BASENAME="`echo $ZFSROOT | cut -d '/' -f 3`"
   echo 'zfs_load="YES"' >> ${FSMNT}/boot/loader.conf
-  echo "vfs.root.mountfrom=\"zfs:${ZFSROOT}/root\"" >> ${FSMNT}/boot/loader.conf
+  echo "vfs.root.mountfrom=\"zfs:${BASENAME}/root\"" >> ${FSMNT}/boot/loader.conf
   echo 'vm.kmem_size="512M"' >>${FSMNT}/boot/loader.conf
   echo 'vm.kmem_size_max="512M"' >>${FSMNT}/boot/loader.conf
 
@@ -166,7 +167,7 @@
   for i in `ls`
   do
     # Only set the mounts on partitions besides root
-    if [ "${i}" != "${ZFSROOT}" ]
+    if [ "${i}" != "${BASENAME}" ]
     then
       zfs set mountpoint=`cat ${i}` ${i}/`cat ${i}`
     fi