From b5d62545bed110b271638e12fbd4bd1ba4a5f3d0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Fri, 4 Dec 2015 12:09:07 +0000
Subject: [PATCH] Option to change the ssh port used by images

---
 man/freedombone-image.1.gz      | Bin 2171 -> 2202 bytes
 src/freedombone-image           |  12 ++++++++++--
 src/freedombone-image-customise |   5 ++++-
 src/freedombone-image-make      |   2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz
index c26f15b89baa236019c030ec2c1a030bc03a4507..a4438262914b11f7c5ae3109b72e1dadd372d4de 100644
GIT binary patch
literal 2202
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

literal 2171
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

diff --git a/src/freedombone-image b/src/freedombone-image
index fe5fe796..4ff9030a 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -79,6 +79,9 @@ GENERIC_IMAGE="yes"
 # Whether to reduce the number of decisions during interactive install
 MINIMAL_INSTALL="yes"
 
+# default SSH port
+SSH_PORT=2222
+
 while [[ $# > 1 ]]
 do
 key="$1"
@@ -152,6 +155,10 @@ case $key in
     shift
     MINIMAL_INSTALL="$1"
     ;;
+    --ssh|--sshport)
+    shift
+    SSH_PORT="$1"
+    ;;
     *)
     # unknown option
     ;;
@@ -218,7 +225,8 @@ make $IMAGE_TYPE \
     IMAGE_SIZE="$IMAGE_SIZE" \
     SSH_PUBKEY="$SSH_PUBKEY" \
     GENERIC_IMAGE="$GENERIC_IMAGE" \
-    MINIMAL_INSTALL="$MINIMAL_INSTALL"
+    MINIMAL_INSTALL="$MINIMAL_INSTALL" \
+    SSH_PORT="$SSH_PORT"
 
 if [ ! "$?" = "0" ]; then
     echo $'Build failed'
@@ -262,7 +270,7 @@ Image was created.
 You will be able to log into it with:
 "
 if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then
-    echo $"    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p 2222
+    echo $"    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT
 
     Password: $PASSWORD
 "
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index a1bdf69d..37c7c850 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -62,6 +62,9 @@ SSH_PUBKEY="no"
 # Whether this is a generic image for mass redistribution on the interwebs
 GENERIC_IMAGE="no"
 
+# default SSH port
+SSH_PORT=2222
+
 enable_eatmydata_override() {
     chroot $rootdir apt-get install --no-install-recommends -y eatmydata
     if [ -x $rootdir/usr/bin/eatmydata ] && \
@@ -176,7 +179,7 @@ following commands, then enter your details.
 }
 
 configure_ssh() {
-    sed -i "s/Port .*/Port 2222/g" $rootdir/etc/ssh/sshd_config
+    sed -i "s/Port .*/Port ${SSH_PORT}/g" $rootdir/etc/ssh/sshd_config
 
     if [[ "$SSH_PUBKEY" != "no" ]]; then
         if [ ! -d $rootdir/home/$MY_USERNAME/.ssh ]; then
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index 09852ae9..f07faa4d 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -52,6 +52,7 @@ export CONFIG_FILENAME
 export SSH_PUBKEY
 export GENERIC_IMAGE
 export MINIMAL_INSTALL
+export SSH_PORT
 
 # Locate vmdebootstrap program fetched in Makefile
 basedir=`pwd`
@@ -164,6 +165,7 @@ sudo sed -i "s|CONFIG_FILENAME=.*|CONFIG_FILENAME=${CONFIG_FILENAME}|g" $TEMP_CU
 sudo sed -i "s|SSH_PUBKEY=.*|SSH_PUBKEY=${SSH_PUBKEY}|g" $TEMP_CUSTOMISE
 sudo sed -i "s|GENERIC_IMAGE=.*|GENERIC_IMAGE=${GENERIC_IMAGE}|g" $TEMP_CUSTOMISE
 sudo sed -i "s|MINIMAL_INSTALL=.*|MINIMAL_INSTALL=\"${MINIMAL_INSTALL}\"|g" $TEMP_CUSTOMISE
+sudo sed -i "s|SSH_PORT=.*|SSH_PORT=\"${SSH_PORT}\"|g" $TEMP_CUSTOMISE
 
 echo $"starting $VMDEBOOTSTRAP"
 # Run vmdebootstrap script to create image