Freebsd BETA 3

remove rc.conf from installer
bugfix: swap index

diff --git a/zfsinstall.sh b/zfsinstall.sh
index 6d86850273c3bebc3da02b3cec0c2fccc2ab4ce6..1e77b9a371bddcaaabf5ec7c10d36dbc4fb6ad47 100644 (file)
--- a/zfsinstall.sh
+++ b/zfsinstall.sh
@@ -88,7 +88,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
 
@@ -97,7 +97,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
 
@@ -105,7 +105,7 @@ echo writing configuration files
 echo ==========================
 
 cat << EOF >> ${DESTDIR}/etc/fstab
-/dev/${DESTDISK}p3 none        swap    sw  0   0
+/dev/${DESTDISK}p2 none        swap    sw  0   0
 tmpfs  /tmp    tmpfs   rw,mode=1777    0       0
 EOF
 
@@ -118,16 +118,6 @@ 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
-
 COPYCAT="/etc"
 cd ${SCRIPTBASE}${COPYCAT} || exit 1
 echo installing files into ${COPYCAT}
@@ -136,6 +126,7 @@ for I in *.conf*; do
                 install -o root -g wheel -m 0644  ${I} ${DESTDIR}${COPYCAT}/
         fi
 done
+
 COPYCAT="/etc/rc.conf.d"
 cd ${SCRIPTBASE}${COPYCAT} || exit 1
 install -o root -g wheel -d -m 0755 ${DESTDIR}${COPYCAT} || exit 1