setup-disk: exit if either mode or disk is 'none'

setup-disk.in

@@ -1468,7 +1468,9 @@ while getopts "hek:Lm:o:qrs:v" opt; do
 done
 shift $(( $OPTIND - 1))
 
-[ "$DISK_MODE" = "none" ] && exit 0
+if [ "$DISK_MODE" = "none" ] || [ "$1" = "none" ]; then
+	exit 0
+fi
 
 if is_rpi; then
 	: ${BOOTLOADER:=raspberrypi-bootloader}

tests/setup_disk_test

@@ -2,15 +2,23 @@
 
 . $(atf_get_srcdir)/test_env.sh
 init_tests \
-	setup_disk_usage
+	setup_disk_usage \
+	setup_disk_mode_none \
+	setup_disk_none \
 
 setup_disk_usage_body() {
 	test_usage setup-disk
 }
 
-setup_disk_usage_body() {
+setup_disk_mode_none_body() {
 	init_env
 	atf_check -s exit:0 \
 		setup-disk -m none
 }
 
+setup_disk_none_body() {
+	init_env
+	atf_check -s exit:0 \
+		setup-disk none
+}
+