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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-07 11:29:41 -0700 (Thu, 07 Aug 2008)
New Revision: 2550

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

Updated install scripts to also use "d" partition properly



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh	2008-08-07 18:26:11 UTC (rev 2549)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh	2008-08-07 18:29:41 UTC (rev 2550)
@@ -43,9 +43,9 @@
   # Get the raw ZFSROOTPART name, and mount it
   ZFSROOTPART="`echo $ROOTPART | cut -d "/" -f 3`"
   zfs create ${ZFSROOTPART}e/root
-  zfs set mountpoint=/mnt ${ZFSROOTPART}e/root
+  zfs set mountpoint=/mnt ${ZFSROOTPART}d/root
 
-  echo "legacy" > /uzip/zfsmnts/${ZFSROOTPART}e
+  echo "legacy" > /uzip/zfsmnts/${ZFSROOTPART}d
 
   # Create some directories on the ZFS partition
   mkdir ${FSMNT}/etc 2>/dev/null
@@ -76,19 +76,21 @@
 ##
 if [ "$FS" = "ZFS" ]
 then
-  part_f=${3}
-  part_g=${4}
-  part_h=${5}
-else
   part_e=${3}
   part_f=${4}
   part_g=${5}
   part_h=${6}
+else
+  part_d=${3}
+  part_e=${4}
+  part_f=${5}
+  part_g=${6}
+  part_h=${7}
 fi
 
 
 
-for lpart in `echo "e f g h"`
+for lpart in `echo "d e f g h"`
 do
   eval varname="part_${lpart}"
   eval cur_part="\$${varname}"

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh	2008-08-07 18:26:11 UTC (rev 2549)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh	2008-08-07 18:29:41 UTC (rev 2550)
@@ -47,7 +47,7 @@
   newfs ${1}a >/dev/null 2>/dev/null
 
 
-  for DevName in `ls -1 ${1}[e-h]`
+  for DevName in `ls -1 ${1}[d-h]`
   do
     echo "Running Newfs on ${DevName}"
     BASENAME="`echo $DevName | cut -d '/' -f 3`"
@@ -55,7 +55,7 @@
     zfs set mountpoint=none ${BASENAME}
   done
 
-  echo "${1}e" > /uzip/ZFS-root
+  echo "${1}d" > /uzip/ZFS-root
   exit 0
 
 fi