Don't change default to the boot volume until after we've found we aren't doing -F. For tool-fdisk enforce -F and use #defines to make code that can no longer possibly execute compile.