Command to format drives as LUKS

Makefile

@@ -44,6 +44,7 @@ install:
 	install -m 755 src/${APP}-addsipuser ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-rmsipuser ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-sipfreeext ${DESTDIR}${PREFIX}/bin
+	install -m 755 src/${APP}-format ${DESTDIR}${PREFIX}/bin
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-keydrive.1.gz ${DESTDIR}${PREFIX}/share/man/man1
@@ -73,6 +74,7 @@ install:
 	install -m 644 man/${APP}-logging.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-addsipuser.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-rmsipuser.1.gz ${DESTDIR}${PREFIX}/share/man/man1
+	install -m 644 man/${APP}-format.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 uninstall:
 	rm -f ${PREFIX}/share/man/man1/${APP}.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-keydrive.1.gz
@@ -102,6 +104,7 @@ uninstall:
 	rm -f ${PREFIX}/share/man/man1/${APP}-logging.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-addsipuser.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-rmsipuser.1.gz
+	rm -f ${PREFIX}/share/man/man1/${APP}-format.1.gz
 	rm -rf ${PREFIX}/share/${APP}
 	rm -f ${PREFIX}/bin/${APP}
 	rm -f ${PREFIX}/bin/zeronetavahi
@@ -135,6 +138,7 @@ uninstall:
 	rm -f ${PREFIX}/bin/${APP}-addsipuser
 	rm -f ${PREFIX}/bin/${APP}-rmsipuser
 	rm -f ${PREFIX}/bin/${APP}-sipfreeext
+	rm -f ${PREFIX}/bin/${APP}-format
 clean:
 	rm -f \#* \.#* debian/*.substvars debian/*.log
 	rm -fr deb.* debian/${APP}

src/freedombone-format

@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+# Makes a USB drive containing a gpg key fragment
+#
+# License
+# =======
+#
+# Copyright (C) 2015 Bob Mottram <bob@robotics.uk.to>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+if [ ! $1 ]; then
+   echo 'Specify a drive, such as sdb, sdc, etc'
+   exit 1
+fi
+
+USB_DRIVE=/dev/$1
+
+echo "Formatting $USB_DRIVE as LUKS"
+cryptsetup -y -v luksFormat $USB_DRIVE
+if [ ! "$?" = "0" ]; then
+    echo "Failed to format $USB_DRIVE as LUKS"
+    exit 36823
+fi
+cryptsetup luksOpen $USB_DRIVE encrypted_usb
+if [ ! "$?" = "0" ]; then
+    echo "Failed to open LUKS formatted drive $USB_DRIVE"
+    exit 37232
+fi
+mkfs.ext4 /dev/mapper/encrypted_usb
+if [ ! "$?" = "0" ]; then
+    echo 'Format of drive $USB_DRIVE failed'
+    exit 73218
+fi
+cryptsetup luksClose encrypted_usb
+if [ -f /dev/mapper/encrypted_usb ]; then
+    rm -rf /dev/mapper/encrypted_usb
+fi
+echo 'Format completed'
+exit 0

src/freedombone-keydrive

@@ -105,24 +105,10 @@ cryptsetup luksClose encrypted_usb
 
 # optionally format the drive
 if [[ $FORMAT == "yes" ]]; then
-  echo "Formatting ${USB_DRIVE::-1} as LUKS"
-  cryptsetup -y -v luksFormat ${USB_DRIVE::-1}
+  freedombone-format ${USB_DRIVE::-1}
   if [ ! "$?" = "0" ]; then
       exit 36823
   fi
-  cryptsetup luksOpen ${USB_DRIVE::-1} encrypted_usb
-  if [ ! "$?" = "0" ]; then
-      exit 37232
-  fi
-  mkfs.ext4 /dev/mapper/encrypted_usb
-  if [ ! "$?" = "0" ]; then
-      exit 73218
-  fi
-  cryptsetup luksClose encrypted_usb
-  if [ -f /dev/mapper/encrypted_usb ]; then
-      rm -rf /dev/mapper/encrypted_usb
-  fi
-  echo 'Format completed'
 fi
 
 cryptsetup luksOpen $USB_DRIVE encrypted_usb