TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-20 21:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine: resolv.conf spelling corrections

Browse Source 
Signed-off-by: wardn <wardn@users.noreply.github.com>
This commit is contained in:
wardn 2020-02-21 15:27:21 -08:00 committed by Brad Fitzpatrick
parent ebc70acac7
commit c51b8c206d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wgengine/router_linux.go
View File

@ -211,7 +211,7 @@ func (r *linuxRouter) replaceResolvConf(servers []wgcfg.IP, domains []string) er
// Backup the existing /etc/resolv.conf file. // Backup the existing /etc/resolv.conf file.
contents, err := ioutil.ReadFile(resolvConf) contents, err := ioutil.ReadFile(resolvConf)
if os.IsNotExist(err) { if os.IsNotExist(err) {
// No existing /etc/resolve.conf file to backup. // No existing /etc/resolv.conf file to backup.
// Nothing to do. // Nothing to do.
return nil return nil
} else if err != nil { } else if err != nil {
@ -246,14 +246,14 @@ func (r *linuxRouter) replaceResolvConf(servers []wgcfg.IP, domains []string) er
func (r *linuxRouter) restoreResolvConf() error { func (r *linuxRouter) restoreResolvConf() error {
if _, err := os.Stat(backupConf); err != nil { if _, err := os.Stat(backupConf); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil // no backup resolve.conf to restore return nil // no backup resolv.conf to restore
} }
return err return err
} }
if ln, err := os.Readlink(resolvConf); err != nil { if ln, err := os.Readlink(resolvConf); err != nil {
return err return err
} else if ln != tsConf { } else if ln != tsConf {
return fmt.Errorf("resolve.conf is not a symlink to %s", tsConf) return fmt.Errorf("resolv.conf is not a symlink to %s", tsConf)
} }
if err := os.Rename(backupConf, resolvConf); err != nil { if err := os.Rename(backupConf, resolvConf); err != nil {
return err return err