cd /usr/src
svn up /usr/src
df -ah /
OLDDATE=20140623; OLDREV=267801; NEWDATE=20140722; NEWREV=268979

rm -f /usr/obj/usr/src/sys/VBOX/vers* /usr/obj/usr/src/sys/boot/amd64/efi/vers.? /usr/obj/usr/src/sys/boot/i386/{,zfs}loader/vers.? /usr/obj/usr/src/sys/boot/userboot/userboot/vers.{So,c}

script -t 0 /root/tmp/make-buildworld-buildkernel-${NEWDATE}-r${NEWREV}.txt make -j 4 -D NO_CLEAN buildworld buildkernel
mergemaster -p
zfs snapshot zroot/ROOT/${OLDDATE}-r${OLDREV}@pre-${NEWDATE}-r${NEWREV} && zfs clone -o mountpoint=/mnt zroot/ROOT/${OLDDATE}-r${OLDREV}@pre-${NEWDATE}-r${NEWREV} zroot/ROOT/${NEWDATE}-r${NEWREV}
script -t 0 /root/tmp/make-installworld-installkernel-${NEWDATE}-r${NEWREV}.txt make DESTDIR=/mnt installworld installkernel
mergemaster -p -D /mnt
mergemaster -Fi -D /mnt
make DESTDIR=/mnt check-old
zpool set bootfs=zroot/ROOT/${NEWDATE}-r${NEWREV} zroot

history -a
cat /root/.bash_history > /mnt/root/.bash_history
history -a
cat /root/.bash_history > /mnt/root/.bash_history

zfs inherit mountpoint zroot/ROOT/${NEWDATE}-r${NEWREV}
shutdown -r now Upgrading to base/head r${NEWREV}.; logout

# While in single user mode:
gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada0
gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada1
zpool upgrade -a

cd /usr/src

OLDDATE=20140623; OLDREV=267801; NEWDATE=20140722; NEWREV=268979
script -t 0 /root/tmp/make-delete-old-${NEWDATE}-r${NEWREV}.txt make delete-old
script -t 0 /root/tmp/make-delete-old-libs-${NEWDATE}-r${NEWREV}.txt make delete-old-libs

reboot

# To break free from the chain of snapshots and clones, create a new BE:
cd /usr/src
svn up /usr/src
df -ah /
OLDDATE=20140623; OLDREV=267801; NEWDATE=20140722; NEWREV=268979

rm -f /usr/obj/usr/src/sys/VBOX/vers* /usr/obj/usr/src/sys/boot/amd64/efi/vers.? /usr/obj/usr/src/sys/boot/i386/{,zfs}loader/vers.? /usr/obj/usr/src/sys/boot/userboot/userboot/vers.{So,c}

script -t 0 /root/tmp/make-buildworld-buildkernel-${NEWDATE}-r${NEWREV}.txt make -j 4 -D NO_CLEAN buildworld buildkernel
zfs create -o mountpoint=/mnt zroot/ROOT/${NEWDATE}-r${NEWREV}
mergemaster -p -D /mnt
mergemaster -Fi -D /mnt
script -t 0 /root/tmp/make-installworld-installkernel-${NEWDATE}-r${NEWREV}.txt make DESTDIR=/mnt installworld installkernel
zpool set bootfs=zroot/ROOT/${NEWDATE}-r${NEWREV} zroot

zfs inherit mountpoint zroot/ROOT/${NEWDATE}-r${NEWREV}
zfs set mountpoint=/mnt zroot/ROOT/${NEWDATE}-r${NEWREV}

tar cf - \
  /.bash* \
  /.cshrc \
  /.inputrc \
  /.profile \
  /.rnd \
  /.shrc \
  /COPYRIGHT \
  /boot/device.hints \ # or /bootpool/boot/device.hints
  /boot/loader.conf \  # or /bootpool/boot/loader.conf
  /boot/modules \      # or /bootpool/boot/modules
  /boot/zfs \          # or /bootpool/boot/zfs
  /entropy \
  /etc \
  /root \
  | (cd /mnt; tar xvvf -)

ln -s usr/compat /mnt/compat
ln -s ../local/bin/perl5.20.2 /mnt/usr/bin/perl
ln -s ../local/bin/perl5.20.2 /mnt/usr/bin/perl5

history -a
cat /root/.bash_history > /mnt/root/.bash_history
history -a
cat /root/.bash_history > /mnt/root/.bash_history

zfs inherit mountpoint zroot/ROOT/${NEWDATE}-r${NEWREV}
shutdown -r now Upgrading to base/head r${NEWREV}.; logout

# while in single user mode
gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada0
gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada1
zpool upgrade -a

cd /usr/src
make check-old

OLDDATE=20140623; OLDREV=267801; NEWDATE=20140722; NEWREV=268979
script -t 0 /root/tmp/make-delete-old-${NEWDATE}-r${NEWREV}.txt make delete-old
script -t 0 /root/tmp/make-delete-old-libs-${NEWDATE}-r${NEWREV}.txt make delete-old-libs

reboot