Browse Source

Image creation interactive mode

Bob Mottram 9 years ago
parent
commit
bbac58020a
2 changed files with 16 additions and 1 deletions
  1. BIN
      man/freedombone-image.1.gz
  2. 16
    1
      src/freedombone-image

BIN
man/freedombone-image.1.gz View File


+ 16
- 1
src/freedombone-image View File

61
 # Optional ssh public key to allow
61
 # Optional ssh public key to allow
62
 SSH_PUBKEY="no"
62
 SSH_PUBKEY="no"
63
 
63
 
64
+# interactive mode
65
+INTERACTIVE="no"
66
+
64
 while [[ $# > 1 ]]
67
 while [[ $# > 1 ]]
65
 do
68
 do
66
 key="$1"
69
 key="$1"
122
     shift
125
     shift
123
     NAMESERVER2="$1"
126
     NAMESERVER2="$1"
124
     ;;
127
     ;;
128
+    -i|--interactive)
129
+    shift
130
+    INTERACTIVE="$1"
131
+    ;;
125
     *)
132
     *)
126
     # unknown option
133
     # unknown option
127
     ;;
134
     ;;
129
 shift
136
 shift
130
 done
137
 done
131
 
138
 
139
+if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
140
+    freedombone-config
141
+    if [ -f freedombone.cfg ]; then
142
+        CONFIG_FILENAME=freedombone.cfg
143
+        DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
144
+    fi
145
+fi
146
+
132
 if [ ! $PASSWORD ]; then
147
 if [ ! $PASSWORD ]; then
133
     # generate a random password
148
     # generate a random password
134
     PASSWORD="$(openssl rand -base64 10 | cut -c1-8)"
149
     PASSWORD="$(openssl rand -base64 10 | cut -c1-8)"
177
     PROJECT_NAME="$PROJECT_NAME" \
192
     PROJECT_NAME="$PROJECT_NAME" \
178
     CONFIG_FILENAME="$CONFIG_FILENAME" \
193
     CONFIG_FILENAME="$CONFIG_FILENAME" \
179
     IMAGE_SIZE="$IMAGE_SIZE" \
194
     IMAGE_SIZE="$IMAGE_SIZE" \
180
-	SSH_PUBKEY="$SSH_PUBKEY"
195
+    SSH_PUBKEY="$SSH_PUBKEY"
181
 
196
 
182
 shopt -s nullglob
197
 shopt -s nullglob
183
 imgfiles=(build/${PROJECT_NAME}*.img)
198
 imgfiles=(build/${PROJECT_NAME}*.img)