forgotten directory name changes
Fix upgrade bugs introduced with last commit
Preserve all of /data when upgrading from CD
Handle failed CD upgrades slightly better than failing to boot
Fix syntax error
Preserve zfs cachefile through cd upgrades
Preserve user installed kernel modules through upgrades
Preserve root ssh keys across upgrades
Roll up commit from ix repo
sync with ix repo, brings a whole raft of improvements to FreeNAS