X-Git-Url: http://popeye.lapinbilly.eu/git/?p=zfsinstaller.git;a=blobdiff_plain;f=zfsinstall.sh;h=6d86850273c3bebc3da02b3cec0c2fccc2ab4ce6;hp=b34634952c9b653978e44408ee87db8180790d6e;hb=da71a34b846c8871904f04e7b6b20f8debdab7a8;hpb=bb26d87271f6c61334a9bd30751335bce207dae7

diff --git a/zfsinstall.sh b/zfsinstall.sh
index b346349..6d86850 100644
--- a/zfsinstall.sh
+++ b/zfsinstall.sh
@@ -34,9 +34,9 @@ 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 bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ${DESTDISK}
 gpart set -a active ${DESTDISK}
 
 gpart show ${DESTDISK}  
@@ -97,7 +97,7 @@ echo =======================================
 
 
 for I in base.txz kernel.txz lib32.txz; do
-	fetch http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/11.2-RELEASE/${I}
+	fetch http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/12.0-BETA2/${I}
 	tar --unlink -pJxf ${I} -C ${DESTDIR}
 done
 
@@ -105,7 +105,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
 
@@ -121,34 +121,31 @@ 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"
 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