back to efi

[zfsinstaller.git] / zfsinstall.sh

diff --git a/zfsinstall.sh b/zfsinstall.sh
index aa8a465fdd5a461ef62fd8626a381f3843d5551c..71a781d1983ab44b0207778f58d19e9d22083091 100644 (file)
--- a/zfsinstall.sh
+++ b/zfsinstall.sh
@@ -33,12 +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 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 set -a active ${DESTDISK}
 
 gpart show ${DESTDISK}  
@@ -90,7 +90,7 @@ zfs list -r ${ZPOOL}
 
 cd ${DESTDIR}/tmp
 if [ "${?}" -ne 0 ]; then
-       echo zfs mountpoints arent ready
+       echo zfs mountpoints are not ready
        exit 1
 fi
 
@@ -99,7 +99,7 @@ echo =======================================
 
 
 for I in base.txz kernel.txz lib32.txz; do
-       fetch http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/12.0-BETA2/${I}
+       fetch http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/12.0-BETA3/${I}
        tar --unlink -pJxf ${I} -C ${DESTDIR}
 done
 
@@ -120,37 +120,24 @@ cat << EOF >> ${DESTDIR}/boot/loader.conf.local
 vfs.root.mountfrom="zfs:${ZPOOL}/ROOT/master"
 EOF
 
-cat << EOF >> ${DESTDIR}/etc/rc.conf
-sshd_enable="YES"
-sendmail_enable="NONE"
-# kld_list="vmm cuse4bsd cpuctl filemon"
-ntpd_enable="YES"
-# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable
-dumpdev="AUTO"
-zfs_enable="YES"
-EOF
-
-cd ${SCRIPTBASE}
-for I in resolv.conf rc.conf.local; do
-       if [ -r "${I}" ]; then
-               echo installing ${I}
-               install -o root -g wheel -m 0644  ${I} ${DESTDIR}/etc/
-       fi
-done
-
-for I in loader.conf.local; do
-       if [ -r "${I}" ]; then
-               echo installing ${I}
-               install -o root -g wheel -m 0644 ${I} ${DESTDIR}/boot/
-       fi
+COPYCAT="/etc"
+cd ${SCRIPTBASE}${COPYCAT} || exit 1
+echo installing files into ${COPYCAT}
+for I in *.conf*; do
+        if [ -r "${I}" -a -f ${I} ]; then
+                install -o root -g wheel -m 0644  ${I} ${DESTDIR}${COPYCAT}/
+        fi
 done
-
-echo installing rc.conf.d
-install -o root -g wheel -d -m 0755 ${DESTDIR}/etc/rc.conf.d 
-if [ -d "./rc.conf.d" ]; then 
-       echo installing files into rc.conf.d
-       install -o root -g wheel -m 0644 ./rc.conf.d/* ${DESTDIR}/etc/rc.conf.d/
-fi
+COPYCAT="/etc/rc.conf.d"
+cd ${SCRIPTBASE}${COPYCAT} || exit 1
+install -o root -g wheel -d -m 0755 ${DESTDIR}${COPYCAT} || exit 1
+echo installing files into ${COPYCAT}
+install  -o root -g wheel -m 0644 * ${DESTDIR}${COPYCAT}/
+COPYCAT="/etc/rc.conf.d/network"
+cd ${SCRIPTBASE}${COPYCAT} || exit 1
+install -o root -g wheel -d -m 0755 ${DESTDIR}${COPYCAT} || exit 1
+echo installing files into ${COPYCAT}
+install  -o root -g wheel -m 0644 * ${DESTDIR}${COPYCAT}/
 
 chroot ${DESTDIR} passwd
 chroot ${DESTDIR} adduser