mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-05-02 06:00:25 +03:00
Pull request 2287: 7315-fix-client-storage-panic
Closes #7315. Squashed commit of the following: commit94c8473a14
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Oct 3 19:09:23 2024 +0300 all: upd chlog commit82b772b1dd
Merge:e7f34cc43
4919630cc
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Oct 3 19:00:53 2024 +0300 Merge branch 'master' into 7315-fix-client-storage-panic commite7f34cc435
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Oct 3 17:55:39 2024 +0300 home: fix client storage panic
This commit is contained in:
parent
4919630ccc
commit
df097341c3
3 changed files with 18 additions and 11 deletions
internal/home
|
@ -148,6 +148,14 @@ func setupContext(opts options) (err error) {
|
|||
Context.tlsRoots = aghtls.SystemRootCAs()
|
||||
Context.mux = http.NewServeMux()
|
||||
|
||||
if !opts.noEtcHosts {
|
||||
err = setupHostsContainer()
|
||||
if err != nil {
|
||||
// Don't wrap the error, because it's informative enough as is.
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if Context.firstRun {
|
||||
log.Info("This is the first time AdGuard Home is launched")
|
||||
checkPermissions()
|
||||
|
@ -168,14 +176,6 @@ func setupContext(opts options) (err error) {
|
|||
os.Exit(0)
|
||||
}
|
||||
|
||||
if !opts.noEtcHosts {
|
||||
err = setupHostsContainer()
|
||||
if err != nil {
|
||||
// Don't wrap the error, because it's informative enough as is.
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue