Revert "Update external/gptfdisk to 1.0.1"
This reverts commit 74b7490a22bb9ad5f521a62b9c9100e70b94da9b.
This change caused a regression in fugu usb formatting.
Bug: 35217931
Test: None
Change-Id: I50c73bde912a7c941e1d67d41bfab02042db88eb
diff --git a/gdisk_test.sh b/gdisk_test.sh
index 25e2651..8c5d800 100755
--- a/gdisk_test.sh
+++ b/gdisk_test.sh
@@ -115,23 +115,9 @@
w
Y
EOF
-
- ret=$?
- if [ $ret -ne 0 ]
- then
- pretty_print "FAILED" "gdisk return $ret when creating partition table"
- exit 1
- fi
;;
sgdisk)
$SGDISK_BIN $TEMP_DISK -${OPT_CLEAR}
-
- ret=$?
- if [ $ret -ne 0 ]
- then
- pretty_print "FAILED" "sgdisk return $ret when creating partition table"
- exit 1
- fi
;;
esac
@@ -161,7 +147,7 @@
;;
sgdisk)
- $SGDISK_BIN $TEMP_DISK -${OPT_NEW} 1 -${OPT_CHANGE_NAME} 1:"${TEST_PART_DEFAULT_NAME}" -${OPT_CHANGE_TYPE} 1:$TEST_PART_TYPE
+ $SGDISK_BIN $TEMP_DISK -${OPT_NEW} 1 -${OPT_CHANGE_NAME} 1:"${TEST_PART_DEFAULT_NAME}"
;;
esac
@@ -325,7 +311,6 @@
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
}
@@ -368,7 +353,7 @@
###################################
# create a file to simulate a real device
-dd if=/dev/zero of=$TEMP_DISK bs=1024 count=$TEMP_DISK_SIZE > /dev/null 2>&1
+dd if=/dev/zero of=$TEMP_DISK bs=1024 count=$TEMP_DISK_SIZE
if [ -s $TEMP_DISK ]
then