bugfix: zfs driver within a strip (see master)

diff --git a/zfsinstall.sh b/zfsinstall.sh
index 1e77b9a371bddcaaabf5ec7c10d36dbc4fb6ad47..f9dae727280517ba3179ffcdd906c16a57205736 100644 (file)
--- a/zfsinstall.sh
+++ b/zfsinstall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DESTDISK="ada0"
+DESTDISK="ada0 ada1"
 DESTDIR="/mnt/zfs"
 ZPOOL="zroot"
 
@@ -17,36 +17,43 @@ fi
 
 # check if the disk is ok for writing
 
-echo checking sanity ${DESTDISK} 
-echo =============
-gpart show ${DESTDISK}  1>/dev/null
-if [ "${?}" -eq 0 ]; then
+for D in ${DESTDISKS}; do
+       if [ -z "${DESTDISK_1}" ]; then 
+               DESTDISK_1=${D}
+       fi
+
+       echo checking sanity ${D} 
+       echo =============
+       gpart show ${D}  1>/dev/null
+       if [ "${?}" -eq 0 ]; then
 
-       gpart destroy -F ${DESTDISK}
-       if [ "${?}" -ne 0 ]; then
-               echo unable to reset ${DESTDISK}
-               exit 1
+               gpart destroy -F ${D}
+               if [ "${?}" -ne 0 ]; then
+                       echo unable to reset ${D}
+                       exit 1
+               fi
        fi
-fi
 
-echo partitioning ${DESTDISK} 
-echo =============
+       echo partitioning ${D} 
+       echo =============
 
-gpart create -s gpt ${DESTDISK}
-gpart add -a 4k -t freebsd-boot -s 512k -l gptboot0 ${DESTDISK}
-gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ${DESTDISK}
-gpart add -a 1m -s 32G -t freebsd-swap -l swap0 ${DESTDISK}
-gpart add -a 1m -t freebsd-zfs -l zfs0 ${DESTDISK}
-gpart set -a active ${DESTDISK}
+       N=$( echo ${D} | tr -c -d '0-9' )
+       gpart create -s gpt ${D}
+       gpart add -a 4k -t freebsd-boot -s 512k -l gptboot${N} ${D}
+       gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ${D}
+       gpart add -a 1m -s 32G -t freebsd-swap -l swap${N} ${D}
+       gpart add -a 1m -t freebsd-zfs -l zfs${N} ${D}
+       gpart set -a active ${D}
 
-gpart show ${DESTDISK}  
+       gpart show ${D}  
+done
 
 sysctl vfs.zfs.min_auto_ashift=12
 
 echo set up zfs pool: ${ZPOOL} alt mount: ${DESTDIR}
 echo =================
 
-zpool create  -m none -f -R ${DESTDIR} ${ZPOOL} ${DESTDISK}p3 ada1
+zpool create  -m none -f -R ${DESTDIR} ${ZPOOL} /dev/gpt/zfs*
 if [ "${?}" -ne 0 ]; then
        echo "unable to create zpool"
        exit 1
@@ -54,7 +61,7 @@ fi
 
 
 for I in ROOT VAR HOME DATA; do
-       zfs create -o mountpoint=none -o canmount=off  ${ZPOOL}/${I}
+       zfs create -o atime=off -o mountpoint=none -o canmount=off  ${ZPOOL}/${I}
 done
 
 zfs create -o atime=off -o mountpoint=/ ${ZPOOL}/ROOT/master
@@ -105,7 +112,7 @@ echo writing configuration files
 echo ==========================
 
 cat << EOF >> ${DESTDIR}/etc/fstab
-/dev/${DESTDISK}p2 none        swap    sw  0   0
+/dev/${DESTDISK_1}p2 none        swap    sw  0   0
 tmpfs  /tmp    tmpfs   rw,mode=1777    0       0
 EOF