[PC-BSD Commits] r4819 - in pcbsd/trunk/pc-sysinstall: . backend

[svn at pcbsd.org]

Author: kris
Date: 2009-10-29 19:23:09 -0700 (Thu, 29 Oct 2009)
New Revision: 4819

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh
   pcbsd/trunk/pc-sysinstall/backend/functions-newfs.sh
   pcbsd/trunk/pc-sysinstall/pcinstall.cfg
Log:

Fixed up the backend a bit further, tested and confirmed that ZFS+GELI works now, will the
madness never end?



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh	2009-10-29 21:27:12 UTC (rev 4818)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh	2009-10-30 02:23:09 UTC (rev 4819)
@@ -15,11 +15,12 @@
     then
       if [ "${PARTMNT}" = "/" ]
       then
-        zfs set mountpoint=legacy ${PART}/root >>${LOGOUT} 2>>${LOGOUT}
+        rc_halt "zfs set mountpoint=legacy ${PART}/root"
         echo "vfs.root.mountfrom=\"zfs:${PART}/root\"" >> ${FSMNT}/boot/loader.conf
       else
         umount ${FSMNT}/${PARTMNT}
-        zfs set mountpoint=${PARTMNT} ${PART}/${PARTMNT} >>${LOGOUT} 2>>${LOGOUT}
+        sleep 2
+        rc_halt "zfs set mountpoint=${PARTMNT} ${PART}${PARTMNT}"
       fi
      FOUNDZFS="1"
     fi
@@ -39,6 +40,7 @@
       echo 'zfs_enable="YES"' >>${FSMNT}/etc/rc.conf
     fi
 
+    sleep 2
     # Copy over any ZFS cache data
     cp /boot/zfs/* ${FSMNT}/boot/zfs/
 
@@ -200,7 +202,7 @@
   # Set the hostname now
   echo_log "Setting hostname: ${HOSTNAME}"
   echo "hostname=\"${HOSTNAME}\"" >> ${FSMNT}/etc/rc.conf
-  sed -e "s|my.domain|${HOSTNAME} ${HOSTNAME}|g" -i .bak ${FSMNT}/etc/hosts
+  sed -i -e "s|my.domain|${HOSTNAME} ${HOSTNAME}|g" ${FSMNT}/etc/hosts
 
 };
 
@@ -260,13 +262,13 @@
  # Generate the fstab for the installed system
  setup_fstab
 
- # Check if we need to setup any ZFS  
- zfs_cleanup 
-
  # Set a hostname on the install system
  setup_hostname
 
  # Set the root_pw if it is specified
  set_root_pw
 
+ # Check if we need to setup any ZFS -  DO THIS LAST
+ zfs_cleanup
+
 };

Modified: pcbsd/trunk/pc-sysinstall/backend/functions-newfs.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-newfs.sh	2009-10-29 21:27:12 UTC (rev 4818)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-newfs.sh	2009-10-30 02:23:09 UTC (rev 4819)
@@ -10,7 +10,7 @@
   PARTMNT="$3"
   EXT="$4"
   ROOTSLICE="`echo ${PART} | rev | cut -b 2- | rev`"
-  rc_halt "zpool create -f ${PART} ${PART}${EXT}"
+  rc_halt "zpool create -m none -f ${PART} ${PART}${EXT}"
 
   # Check if we ended up with needing a zfs bootable partition
   if [ "${PARTMNT}" = "/" -o "${PARTMNT}" = "/boot" ]
@@ -24,8 +24,6 @@
     rc_halt "zpool import ${PART}"
   fi
 
-  # Unmount this pool, don't need it auto-mounted by ZFS
-  umount /${PART}
 };
 
 # Runs newfs on all the partiions which we've setup with bsdlabel

Modified: pcbsd/trunk/pc-sysinstall/pcinstall.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-10-29 21:27:12 UTC (rev 4818)
+++ pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-10-30 02:23:09 UTC (rev 4819)
@@ -16,7 +16,7 @@
 # UFS.eli, UFS+S.eli, UFS+J.eli, ZFS.eli, SWAP.eli
 disk0-part=UFS+S 500 /
 disk0-part=SWAP.eli 2000 none
-disk0-part=UFS+J.eli 0 /usr
+disk0-part=ZFS.eli 0 /usr
 # Size 0 means use the rest of the slice size
 # Do it now!
 commitDiskLabel