Use a variable as a guard to run proper code path
Move chained shell command to separate begin/rescue blocks
Merge pull request #680 from caskdata/feature/joyent-disk

Improve Joyent disk handling for Certified Ubuntu