ソースを参照

Show generated password using dialog

Bob Mottram 9 年 前
コミット
af1f72a7a4
共有1 個のファイルを変更した2 個の追加20 個の削除を含む
  1. 2
    20
      src/freedombone-image-customise

+ 2
- 20
src/freedombone-image-customise ファイルの表示

@@ -220,19 +220,6 @@ EOF
220 220
     cat >> $rootdir/root/.bashrc <<EOF
221 221
 # initial setup of the system
222 222
 if [ -f ~/.initial_setup ]; then
223
-    clear
224
-    echo "
225
- .---.                  .              .
226
- |                      |              |
227
- |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
228
- |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
229
- '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
230
-
231
-                   Initial setup process
232
-"
233
-    echo 'This is your new password. Use it whenever you wish to ssh into'
234
-    echo 'this system.'
235
-    echo ''
236 223
 EOF
237 224
     echo '    if [ -f ~/login.txt ]; then' >> $rootdir/root/.bashrc
238 225
     echo '        NEW_USER_PASSWORD=$(cat ~/login.txt)' >> $rootdir/root/.bashrc
@@ -245,14 +232,9 @@ EOF
245 232
     echo '        NEW_USER_PASSWORD="$(openssl rand -base64 12 | cut -c1-10)"' >> $rootdir/root/.bashrc
246 233
     echo '    fi' >> $rootdir/root/.bashrc
247 234
     echo '    echo -n "${NEW_USER_PASSWORD}" > ~/login.txt' >> $rootdir/root/.bashrc
248
-    echo '    echo "    $NEW_USER_PASSWORD"' >> $rootdir/root/.bashrc
249
-
235
+    echo '    dialog --backtitle "Freedombone initial setup process" --title "New Password" --msgbox "This is your new password. Use it whenever you wish to ssh into this system.\n\n                 $NEW_USER_PASSWORD\n\nPlease take a moment to copy the above password into a password manager or write it down somewhere." 12 50' >> $rootdir/root/.bashrc
236
+	
250 237
     cat >> $rootdir/root/.bashrc <<EOF
251
-    echo ''
252
-    echo 'Copy it into a password manager or write it down somewhere.'
253
-    echo ''
254
-    read -n1 -r -p "Press any key to continue..." key
255
-
256 238
     freedombone menuconfig
257 239
     if [ "$?" = "0" ]; then
258 240
 EOF