change to test for block device for swap setup 

also add -x for debug