X-Git-Url: http://popeye.lapinbilly.eu/git/?p=zfsinstaller.git;a=blobdiff_plain;f=zfsinstall.sh;h=aa8a465fdd5a461ef62fd8626a381f3843d5551c;hp=441cc3e61098126d835572bd4e27c02e56a6c279;hb=c3c67d55f32104765308ac3871e9e77f91988a86;hpb=6a370ca2b52c1046446e4f99394e8818a8820e58

diff --git a/zfsinstall.sh b/zfsinstall.sh
index 441cc3e..aa8a465 100644
--- a/zfsinstall.sh
+++ b/zfsinstall.sh
@@ -33,10 +33,12 @@ echo partitioning ${DESTDISK}
 echo =============
 
 gpart create -s gpt ${DESTDISK}
+gpart add -a 4k -t efi -s 200M -l efiboot0 ${DESTDISK}
+gpart bootcode -p /boot/boot1.efifat -i 1 ${DESTDISK}
 gpart add -a 4k -t freebsd-boot -s 512k -l gptboot0 ${DESTDISK}
+gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 2 ${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 set -a active ${DESTDISK}
 
 gpart show ${DESTDISK}  
@@ -46,21 +48,22 @@ 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
+zpool create  -m none -f -R ${DESTDIR} ${ZPOOL} ${DESTDISK}p4 ada1
 if [ "${?}" -ne 0 ]; then
 	echo "unable to create zpool"
 	exit 1
 fi
 
 
-for I in ROOT VAR HOME; do
+for I in ROOT VAR HOME DATA; do
 	zfs create -o mountpoint=none -o canmount=off  ${ZPOOL}/${I}
 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
+zfs create -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
 
@@ -96,7 +99,7 @@ echo =======================================
 
 
 for I in base.txz kernel.txz lib32.txz; do
-	fetch http://ftp.freebsd.org/pub/FreeBSD/snapshots/amd64/12.0-ALPHA8/${I}
+	fetch http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/12.0-BETA2/${I}
 	tar --unlink -pJxf ${I} -C ${DESTDIR}
 done
 
@@ -104,7 +107,7 @@ echo writing configuration files
 echo ==========================
 
 cat << EOF >> ${DESTDIR}/etc/fstab
-/dev/${DESTDISK}p2 none        swap    sw  0   0
+/dev/${DESTDISK}p3 none        swap    sw  0   0
 tmpfs	/tmp	tmpfs	rw,mode=1777	0	0
 EOF
 
@@ -120,7 +123,7 @@ EOF
 cat << EOF >> ${DESTDIR}/etc/rc.conf
 sshd_enable="YES"
 sendmail_enable="NONE"
-kld_list="vmm cuse4bsd cpuctl filemon"
+# kld_list="vmm cuse4bsd cpuctl filemon"
 ntpd_enable="YES"
 # Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable
 dumpdev="AUTO"