# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1558796403 -7200
# Node ID 63c473a6c9b371c2527ad718deeffc00ca91e072
# Parent  173422bb874144b5a88bbdeec8fa4953deadac95
Changed the partition tool to accept a partitioning summary.

diff -r 173422bb8741 -r 63c473a6c9b3 makesd-partition
--- a/makesd-partition	Sat May 25 01:19:39 2019 +0200
+++ b/makesd-partition	Sat May 25 17:00:03 2019 +0200
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Support partitioning of a device using sfdisk.
+# Support partitioning of a device using sfdisk. This program accepts a
+# partitioning summary on standard input.
 #
 # Important tasks:
 #
@@ -11,8 +12,6 @@
 THISDIR=`dirname "$0"`
 
 COMMON="$THISDIR/makesd-common"
-EXPAND="$THISDIR/makesd-expand-def"
-PARTSUMMARY="$THISDIR/makesd-partition-summary"
 PARTTABLE="$THISDIR/makesd-partition-table"
 SFDISK="/sbin/sfdisk"
 
@@ -37,34 +36,12 @@
 
 check_device
 
-# Test for the cylinder alignment option.
-
-if [ "$1" = '--align' ] ; then
-    ALIGN_CYLINDER="$1"
-    shift 1
-else
-    ALIGN_CYLINDER=
-fi
-
-DEF="$1"
-
-if [ ! "$DEF" ] ; then
-    cat 1>&2 <<EOF
-No definition specified.
-EOF
-    exit 1
-fi
-
 # Initialise sfdisk usage.
 
 init_sfdisk "$DEV"
 
-# Expand the definition to partitioning options.
-# Use the options to generate a partition summary.
-# Convert the summary into a table.
+# Convert the partitioning summary into a partition table description.
 # Present the table to sfdisk.
 
-  "$EXPAND" "$DEF" \
-| xargs "$PARTSUMMARY" \
-| "$PARTTABLE" $ALIGN_CYLINDER \
+  "$PARTTABLE" $* \
 | "$SFDISK" $SFDISK_OPTIONS "$DEV"