X-Git-Url: http://popeye.lapinbilly.eu/git/?p=zfsinstaller.git;a=blobdiff_plain;f=zfsinstall.sh;h=441cc3e61098126d835572bd4e27c02e56a6c279;hp=f78c88f26de1403dccb4515aaf821aa294ddde26;hb=22008cdb1216416ccf72671a65ca9f801da4428b;hpb=b6b4582750fc7597d17521a55e70ceeb9fe35cbf

diff --git a/zfsinstall.sh b/zfsinstall.sh
index f78c88f..441cc3e 100644
--- a/zfsinstall.sh
+++ b/zfsinstall.sh
@@ -33,12 +33,13 @@ echo partitioning ${DESTDISK}
 echo =============
 
 gpart create -s gpt ${DESTDISK}
-gpart add -a 1m -t freebsd-boot -s 128k -l boot ${DESTDISK}
-gpart add -a 1m -s 32G -t freebsd-swap -l swap ${DESTDISK}
+gpart add -a 4k -t freebsd-boot -s 512k -l gptboot0 ${DESTDISK}
+gpart add -a 1m -s 32G -t freebsd-swap -l swap0 ${DESTDISK}
+gpart add -a 1m -t freebsd-zfs -l zfs0 ${DESTDISK}
 gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ${DESTDISK}
-gpart add -a 1m -t freebsd-zfs -l syszfs ${DESTDISK}
+gpart set -a active ${DESTDISK}
 
-gpart show ${DESTDISK}  1>/dev/null
+gpart show ${DESTDISK}  
 
 sysctl vfs.zfs.min_auto_ashift=12
 
@@ -59,14 +60,12 @@ done
 zfs create -o atime=off -o mountpoint=/ ${ZPOOL}/ROOT/master
 zfs create -o mountpoint=/usr/obj ${ZPOOL}/ROOT/obj
 zfs create -o compression=off -o mountpoint=/usr/src ${ZPOOL}/ROOT/src
+zfs create -o copies=1 -o mountpoint=/usr/doc -o compression=on ${ZPOOL}/ROOT/doc
 # useless ? as far /tmp mountpoint will be mounted by tmpfs
 zfs create -o mountpoint=/tmp ${ZPOOL}/ROOT/tmp
 
 zfs create -o mountpoint=/usr/local ${ZPOOL}/LOCAL
 zfs create -o mountpoint=/usr/local/etc ${ZPOOL}/LOCAL/config
-zfs create -o copies=1 -o mountpoint=/usr/src -o compression=off ${ZPOOL}/src
-zfs create -o copies=1 -o mountpoint=/usr/doc -o compression=on ${ZPOOL}/doc
-zfs create -o copies=1 -o mountpoint=/usr/obj -o compression=on ${ZPOOL}/obj
 
 
 zfs create -o mountpoint=/var ${ZPOOL}/VAR/master
@@ -80,6 +79,7 @@ zfs create -o exec=off -o setuid=off -o mountpoint=/var/tmp ${ZPOOL}/VAR/tmp
 
 zfs create -o mountpoint=/usr/home ${ZPOOL}/HOME/master
 
+zpool set bootfs=${ZPOOL}/ROOT/master ${ZPOOL}
 
 chmod 1777 ${DESTDIR}/tmp ${DESTDIR}/var/tmp