split makefs.sh into two scripts

teeth_agent/shell/copy_configdrive_to_disk.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -e
+
+log() {
+  echo "`basename $0`: $@"
+}
+
+usage() {
+  [[ -z "$1" ]] || echo -e "USAGE ERROR: $@\n"
+  echo "`basename $0`: CONFIGDRIVE_DIR DEVICE"
+  echo "  - This script injects CONFIGDRIVE_DIR contents as an iso9660"
+  echo "    filesystem on a partition at the end of DEVICE."
+  exit 1
+}
+
+CONFIGDRIVE_DIR="$1"
+DEVICE="$2"
+
+[[ -d $CONFIGDRIVE_DIR ]] || usage "$CONFIGDRIVE_DIR (CONFIGDRIVE_DIR) is not a directory"
+[[ -b $DEVICE ]] || usage "$DEVICE (DEVICE) is not a block device"
+
+# Create small partition at the end of the device
+log "Adding configdrive partition to $DEVICE"
+parted -a optimal -s -- $DEVICE mkpart primary ext2 -16MiB -0
+
+# Find partition we just created
+# Dump all partitions, ignore empty ones, then get the last partition ID
+ISO_PARTITION=`sfdisk --dump $DEVICE | grep -v ' 0,' | tail -n1 | awk '{print $1}'`
+
+# This generates the ISO image of the config drive.
+log "Writing Configdrive contents in $CONFIGDRIVE_DIR to $ISO_PARTITION"
+genisoimage \
+ -o ${ISO_PARTITION} \
+ -ldots \
+ -input-charset 'utf-8' \
+ -allow-lowercase \
+ -allow-multidot \
+ -l \
+ -publisher "teeth" \
+ -J \
+ -r \
+ -V 'config-2' \
+ ${CONFIGDRIVE_DIR}
+
+log "${DEVICE} imaged successfully!"

teeth_agent/shell/makefs.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# This should work with almost any image that uses MBR partitioning and doesn't already
-# have 3 or more partitions.
-
-set -e
-
-log() {
-  echo "`basename $0`: $@"
-}
-
-usage() {
-  [[ -z "$1" ]] || echo -e "USAGE ERROR: $@\n"
-  echo "`basename $0`: CONFIGDRIVE_DIR IMAGEFILE DEVICE"
-  echo "  - This script images DEVICE with IMAGEFILE and injects"
-  echo "    CONFIGDRIVE_DIR contents as an iso9660 filesystem on a partition"
-  echo "    at the end of the device"
-  exit 1
-}
-
-CONFIGDRIVE_DIR="$1"
-IMAGEFILE="$2"
-DEVICE="$3"
-
-[[ -d $CONFIGDRIVE_DIR ]] || usage "$1 (CONFIGDRIVE_DIR) is not a directory"
-[[ -f $IMAGEFILE ]] || usage "$2 (IMAGEFILE) is not a file"
-[[ -b $DEVICE ]] || usage "$3 (DEVICE) is not a block device"
-
-# In production this will be replaced with secure erasing the drives
-# For now we need to ensure there aren't any old (GPT) partitions on the drive
-log "Erasing existing mbr from ${DEVICE}"
-dd if=/dev/zero of=$DEVICE bs=512 count=10
-
-# Converts image to raw and writes to device
-log "Imaging $IMAGEFILE onto $DEVICE"
-qemu-img convert -O raw $IMAGEFILE $DEVICE
-
-# Create small partition at the end of the device
-log "Adding configdrive partition to $DEVICE"
-parted -a optimal -s -- $DEVICE mkpart primary ext2 -16MiB -0
-
-# Find partition we just created 
-# Dump all partitions, ignore empty ones, then get the last partition ID
-ISO_PARTITION=`sfdisk --dump $DEVICE | grep -v ' 0,' | tail -n1 | awk '{print $1}'`
-
-# This generates the ISO image of the config drive.
-log "Writing Configdrive contents in $CONFIGDRIVE_DIR to $ISO_PARTITION"
-genisoimage \
- -o ${ISO_PARTITION} \
- -ldots \
- -input-charset 'utf-8' \
- -allow-lowercase \
- -allow-multidot \
- -l \
- -publisher "teeth" \
- -J \
- -r \
- -V 'config-2' \
- ${CONFIGDRIVE_DIR}
-
-log "${DEVICE} imaged successfully!"

teeth_agent/shell/write_image.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# This should work with almost any image that uses MBR partitioning and doesn't already
+# have 3 or more partitions.
+
+set -e
+
+log() {
+  echo "`basename $0`: $@"
+}
+
+usage() {
+  [[ -z "$1" ]] || echo -e "USAGE ERROR: $@\n"
+  echo "`basename $0`: IMAGEFILE DEVICE"
+  echo "  - This script images DEVICE with IMAGEFILE"
+  exit 1
+}
+
+IMAGEFILE="$1"
+DEVICE="$2"
+
+[[ -f $IMAGEFILE ]] || usage "$IMAGEFILE (IMAGEFILE) is not a file"
+[[ -b $DEVICE ]] || usage "$DEVICE (DEVICE) is not a block device"
+
+# In production this will be replaced with secure erasing the drives
+# For now we need to ensure there aren't any old (GPT) partitions on the drive
+log "Erasing existing mbr from ${DEVICE}"
+dd if=/dev/zero of=$DEVICE bs=512 count=10
+
+# Converts image to raw and writes to device
+log "Imaging $IMAGEFILE onto $DEVICE"
+qemu-img convert -O raw $IMAGEFILE $DEVICE
+
+log "${DEVICE} imaged successfully!"