Skip to content

Commit f4285f7

Browse files
committed
update some comments in init_server.sh
1 parent cc545b1 commit f4285f7

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

init_server.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ if [ ! -f "$INIT_DATE_FILE" ]; then
176176
select yn in "Yes" "No"; do
177177
case $yn in
178178
Yes) break ;;
179-
No) exit 1 ;;
179+
No) printf '\n.. Installation canceled!\n'; exit 1 ;;
180180
esac ; done
181181
fi
182182

@@ -238,9 +238,9 @@ else
238238
print_not_supported_os
239239
fi
240240

241+
printf '\n### Install current Salt Sources ..\n'
241242
check_salt_repo
242243

243-
244244
printf '\n### Update System ..\n'
245245
"$PKGMNGR" -y update
246246
printf '\n'
@@ -249,7 +249,7 @@ printf '\n'
249249
printf '\n### Install Basic Software ..\n'
250250
"$PKGMNGR" -y install git salt-minion
251251

252-
# run salt-minion only as masterless. disable the service:
252+
# run salt-minion only as masterless and also disable the service
253253
systemctl disable salt-minion ; systemctl stop salt-minion &
254254

255255

@@ -281,10 +281,12 @@ printf '\n### Backup old User configs ..\n'
281281
cp -vf /root/.bashrc /root/.bashrc_bak >/dev/null 2>&1
282282
test -f /root/.bash_aliases && cp -vf /root/.bash_aliases /root/.bash_aliases_bak >/dev/null 2>&1
283283
mv -vf /etc/inputrc /etc/inputrc_bak >/dev/null 2>&1
284+
printf '\nOK.\n'
284285

285286

286287
# ensure uci and /etc/config/ffdd are present
287288
printf '\n### Check uci Setup ..\n'
289+
288290
# uci config
289291
if [ ! -f /etc/config/ffdd ]; then
290292
printf '\n# Create New /etc/config/ffdd ..\n'
@@ -365,7 +367,7 @@ _init_run='0'
365367
if [ -f "$INIT_DATE_FILE" ]; then
366368
printf '\n### run salt ..\n'
367369
else
368-
printf '\n### Start Initial System .. please wait! Coffee Time ~ 10min ..\n'
370+
printf '\n### Start Initial System .. please wait! Coffee Time ~ 5-10min ..\n'
369371
printf '# Please do not delete this file!\n#\nFFDD-Server - INIT DATE: %s\n' "$(date -u)" > "$INIT_DATE_FILE"
370372
chmod 600 "$INIT_DATE_FILE" ; chattr +i "$INIT_DATE_FILE"
371373
_init_run='1'

0 commit comments

Comments
 (0)