Merge commit 'fbb1ae51400266f5fc79088d8ec61da808ab221e'

Exit on all failures and don't use a kernel dependent default gpt type
This commit is contained in:
Roderick W. Smith
2015-06-19 09:07:37 -04:00

View File

@@ -147,7 +147,7 @@ EOF
;;
sgdisk)
$SGDISK_BIN $TEMP_DISK -${OPT_NEW} 1 -${OPT_CHANGE_NAME} 1:"${TEST_PART_DEFAULT_NAME}"
$SGDISK_BIN $TEMP_DISK -${OPT_NEW} 1 -${OPT_CHANGE_NAME} 1:"${TEST_PART_DEFAULT_NAME}" -${OPT_CHANGE_TYPE} 1:$TEST_PART_TYPE
;;
esac
@@ -311,6 +311,7 @@ EOF
pretty_print "SUCCESS" "GUID of disk has been sucessfully changed"
else
pretty_print "FAILED" "GUID of disk is the same as the previous one"
exit 1
fi
}