LineageOS/android_external_gptfdisk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'f8f4ea6ad3ad12a6d41fd4e6c3ec44c4eeb65f3d'

Browse Source 
Improves gdisk_test.sh script
This commit is contained in:
Roderick W. Smith
2015-10-17 18:16:47 -04:00
parent 1392964ef5 f8f4ea6ad3
commit c14a28426f
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -28,6 +28,9 @@ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
fixparts: $(MBR_LIB_OBJS) fixparts.o fixparts: $(MBR_LIB_OBJS) fixparts.o
$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
test:
./gdisk_test.sh
lint: #no pre-reqs lint: #no pre-reqs
lint $(SRCS) lint $(SRCS)

16
gdisk_test.sh
View File

@@ -115,9 +115,23 @@ Y
w w
Y Y
EOF EOF
ret=$?
if [ $ret -ne 0 ]
then
pretty_print "FAILED" "gdisk return $ret when creating partition table"
exit 1
fi
;; ;;
sgdisk) sgdisk)
$SGDISK_BIN $TEMP_DISK -${OPT_CLEAR} $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 esac
@@ -354,7 +368,7 @@ EOF
################################### ###################################
# create a file to simulate a real device # create a file to simulate a real device
dd if=/dev/zero of=$TEMP_DISK bs=1024 count=$TEMP_DISK_SIZE dd if=/dev/zero of=$TEMP_DISK bs=1024 count=$TEMP_DISK_SIZE > /dev/null 2>&1
if [ -s $TEMP_DISK ] if [ -s $TEMP_DISK ]
then then