Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freedombone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Context Sensitive Group
freedombone
Commits
5651aec3
Commit
5651aec3
authored
6 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Check if install has completed when webadmin daemon starts
parent
94f41ffe
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/freedombone-installer
+20
-10
20 additions, 10 deletions
src/freedombone-installer
with
20 additions
and
10 deletions
src/freedombone-installer
+
20
−
10
View file @
5651aec3
...
...
@@ -543,20 +543,30 @@ if [ -f "$install_state_file" ]; then
install_state
=
$(
cat
"
$install_state_file
"
)
# shellcheck disable=SC2086
if
[
$install_state
-ne
$INSTALL_STATE_COMMAND_SUCCESS
]
;
then
chown
www-data:www-data
"
$webadmin_install_dir
/log.txt"
# remove the setup file containing login details
if
[
-f
"
$setup_file
"
]
;
then
rm
"
$setup_file
"
fi
if
[
-f
/etc/nginx/.webadminpasswd
]
;
then
rm
/etc/nginx/.webadminpasswd
if
grep
-q
'install_final'
"
$COMPLETION_FILE
"
;
then
echo
-n
"
$INSTALL_STATE_COMMAND_SUCCESS
"
>
"
$install_state_file
"
install_state
=
$INSTALL_STATE_COMMAND_SUCCESS
else
chown
www-data:www-data
"
$webadmin_install_dir
/log.txt"
# remove the setup file containing login details
if
[
-f
"
$setup_file
"
]
;
then
rm
"
$setup_file
"
fi
if
[
-f
/etc/nginx/.webadminpasswd
]
;
then
rm
/etc/nginx/.webadminpasswd
fi
echo
-n
"
$INSTALL_STATE_FIRST_BOOT
"
>
"
$install_state_file
"
install_state
=
$INSTALL_STATE_FIRST_BOOT
fi
fi
else
if
grep
-q
'install_final'
"
$COMPLETION_FILE
"
;
then
echo
-n
"
$INSTALL_STATE_COMMAND_SUCCESS
"
>
"
$install_state_file
"
install_state
=
$INSTALL_STATE_COMMAND_SUCCESS
else
echo
-n
"
$INSTALL_STATE_FIRST_BOOT
"
>
"
$install_state_file
"
install_state
=
$INSTALL_STATE_FIRST_BOOT
fi
else
echo
-n
"
$INSTALL_STATE_FIRST_BOOT
"
>
"
$install_state_file
"
install_state
=
$INSTALL_STATE_FIRST_BOOT
fi
while
true
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment