From be415c32325b0d94ffc7a29120b63911433d4403 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Thu, 14 Jan 2016 13:37:58 -0500 Subject: src/cmd/installer-pc.sh: Use ${HAVE_SFDISK}, ${SFDISK}, etc. --- diff --git a/src/cmd/installer-pc.sh b/src/cmd/installer-pc.sh index e011864..5dc0caa 100644 --- a/src/cmd/installer-pc.sh +++ b/src/cmd/installer-pc.sh @@ -90,7 +90,11 @@ cmd_installer_pc_make_partition_and_fs() local dev="${1}" dd if=/dev/zero of="${dev}" bs=512 count=1 - printf 'n\np\n1\n\n\nt\n83\na\n1\nw\n' | fdisk "${dev}" + if ${HAVE_SFDISK}; then + printf ',,83,*\n' | ${SFDISK} "${dev}" + elif ${HAVE_FDISK}; then + printf 'n\np\n1\n\n\nt\n83\na\n1\nw\n' | ${FDISK} "${dev}" + fi ${MKE2FS} -t ext4 "${dev}1" } -- cgit v0.9.1