Kaynağa Gözat

Option to change the ssh port used by images

Bob Mottram 9 yıl önce
ebeveyn
işleme
b5d62545be

BIN
man/freedombone-image.1.gz Dosyayı Görüntüle


+ 10
- 2
src/freedombone-image Dosyayı Görüntüle

79
 # Whether to reduce the number of decisions during interactive install
79
 # Whether to reduce the number of decisions during interactive install
80
 MINIMAL_INSTALL="yes"
80
 MINIMAL_INSTALL="yes"
81
 
81
 
82
+# default SSH port
83
+SSH_PORT=2222
84
+
82
 while [[ $# > 1 ]]
85
 while [[ $# > 1 ]]
83
 do
86
 do
84
 key="$1"
87
 key="$1"
152
     shift
155
     shift
153
     MINIMAL_INSTALL="$1"
156
     MINIMAL_INSTALL="$1"
154
     ;;
157
     ;;
158
+    --ssh|--sshport)
159
+    shift
160
+    SSH_PORT="$1"
161
+    ;;
155
     *)
162
     *)
156
     # unknown option
163
     # unknown option
157
     ;;
164
     ;;
218
     IMAGE_SIZE="$IMAGE_SIZE" \
225
     IMAGE_SIZE="$IMAGE_SIZE" \
219
     SSH_PUBKEY="$SSH_PUBKEY" \
226
     SSH_PUBKEY="$SSH_PUBKEY" \
220
     GENERIC_IMAGE="$GENERIC_IMAGE" \
227
     GENERIC_IMAGE="$GENERIC_IMAGE" \
221
-    MINIMAL_INSTALL="$MINIMAL_INSTALL"
228
+    MINIMAL_INSTALL="$MINIMAL_INSTALL" \
229
+    SSH_PORT="$SSH_PORT"
222
 
230
 
223
 if [ ! "$?" = "0" ]; then
231
 if [ ! "$?" = "0" ]; then
224
     echo $'Build failed'
232
     echo $'Build failed'
262
 You will be able to log into it with:
270
 You will be able to log into it with:
263
 "
271
 "
264
 if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then
272
 if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then
265
-    echo $"    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p 2222
273
+    echo $"    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT
266
 
274
 
267
     Password: $PASSWORD
275
     Password: $PASSWORD
268
 "
276
 "

+ 4
- 1
src/freedombone-image-customise Dosyayı Görüntüle

62
 # Whether this is a generic image for mass redistribution on the interwebs
62
 # Whether this is a generic image for mass redistribution on the interwebs
63
 GENERIC_IMAGE="no"
63
 GENERIC_IMAGE="no"
64
 
64
 
65
+# default SSH port
66
+SSH_PORT=2222
67
+
65
 enable_eatmydata_override() {
68
 enable_eatmydata_override() {
66
     chroot $rootdir apt-get install --no-install-recommends -y eatmydata
69
     chroot $rootdir apt-get install --no-install-recommends -y eatmydata
67
     if [ -x $rootdir/usr/bin/eatmydata ] && \
70
     if [ -x $rootdir/usr/bin/eatmydata ] && \
176
 }
179
 }
177
 
180
 
178
 configure_ssh() {
181
 configure_ssh() {
179
-    sed -i "s/Port .*/Port 2222/g" $rootdir/etc/ssh/sshd_config
182
+    sed -i "s/Port .*/Port ${SSH_PORT}/g" $rootdir/etc/ssh/sshd_config
180
 
183
 
181
     if [[ "$SSH_PUBKEY" != "no" ]]; then
184
     if [[ "$SSH_PUBKEY" != "no" ]]; then
182
         if [ ! -d $rootdir/home/$MY_USERNAME/.ssh ]; then
185
         if [ ! -d $rootdir/home/$MY_USERNAME/.ssh ]; then

+ 2
- 0
src/freedombone-image-make Dosyayı Görüntüle

52
 export SSH_PUBKEY
52
 export SSH_PUBKEY
53
 export GENERIC_IMAGE
53
 export GENERIC_IMAGE
54
 export MINIMAL_INSTALL
54
 export MINIMAL_INSTALL
55
+export SSH_PORT
55
 
56
 
56
 # Locate vmdebootstrap program fetched in Makefile
57
 # Locate vmdebootstrap program fetched in Makefile
57
 basedir=`pwd`
58
 basedir=`pwd`
164
 sudo sed -i "s|SSH_PUBKEY=.*|SSH_PUBKEY=${SSH_PUBKEY}|g" $TEMP_CUSTOMISE
165
 sudo sed -i "s|SSH_PUBKEY=.*|SSH_PUBKEY=${SSH_PUBKEY}|g" $TEMP_CUSTOMISE
165
 sudo sed -i "s|GENERIC_IMAGE=.*|GENERIC_IMAGE=${GENERIC_IMAGE}|g" $TEMP_CUSTOMISE
166
 sudo sed -i "s|GENERIC_IMAGE=.*|GENERIC_IMAGE=${GENERIC_IMAGE}|g" $TEMP_CUSTOMISE
166
 sudo sed -i "s|MINIMAL_INSTALL=.*|MINIMAL_INSTALL=\"${MINIMAL_INSTALL}\"|g" $TEMP_CUSTOMISE
167
 sudo sed -i "s|MINIMAL_INSTALL=.*|MINIMAL_INSTALL=\"${MINIMAL_INSTALL}\"|g" $TEMP_CUSTOMISE
168
+sudo sed -i "s|SSH_PORT=.*|SSH_PORT=\"${SSH_PORT}\"|g" $TEMP_CUSTOMISE
167
 
169
 
168
 echo $"starting $VMDEBOOTSTRAP"
170
 echo $"starting $VMDEBOOTSTRAP"
169
 # Run vmdebootstrap script to create image
171
 # Run vmdebootstrap script to create image