Merge pull request #138 from grm34:dev

Update wipefs and fdisk
grm34 · Apr 22, 2020 · 1ea95dd · 1ea95dd
2 parents eb5597f + d01cddc
commit 1ea95dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/archboot b/archboot
@@ -3,7 +3,7 @@ set > old_vars.log
 
 APPNAME="archboot"
 VERSION="v2.9.8"
-BRANCH="master"
+BRANCH="dev"
 AUTHOR="grm34"
 LICENSE="Apache License 2.0"
 

diff --git a/src/arch/partitioning b/src/arch/partitioning
@@ -66,12 +66,12 @@ _default_partitioning_scheme() {
                 _error "${DRIVE} is mounted!"
             else
                 # Otherwise format
+                _check wipefs --force --all ${DRIVE}
                 _check dd if=/dev/zero of=${DRIVE} \
 bs=512 count=1 conv=notrunc status=progress
-                _check wipefs -fa ${DRIVE}
 
                 # And create MBR or GPT partition table
-                printf ${PART_CODE}"\nw" | fdisk ${DRIVE}
+                printf ${PART_CODE}"\nw" | fdisk --wipe=always ${DRIVE}
                 partprobe ${DRIVE}; sleep 1
             fi
             ;;
@@ -166,10 +166,10 @@ bs=512 count=1 conv=notrunc status=progress
         _info "Creating ${PART_NAME,,} partition (${SIZES[${INDEX}]})"
         if [[ ${PART} == "HOME_PARTITION" \
 && ${HOME_SIZE} == "free space" ]]; then
-            printf "n\n${PART_TYPE}\n\n\nw" | fdisk ${DRIVE}
+            printf "n\n${PART_TYPE}\n\n\nw" | fdisk --wipe=always ${DRIVE}
         else
             printf \
-"n\n${PART_TYPE}\n\n+${SIZES[${INDEX}]}\nw" | fdisk ${DRIVE}
+"n\n${PART_TYPE}\n\n+${SIZES[${INDEX}]}\nw" | fdisk --wipe=always ${DRIVE}
         fi
 
         # Set EFI partition type for boot (UEFI firmware only)