lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netconfig: missing lease.json is no error

Browse Source
This commit is contained in:
Michael Stapelberg 2018-06-02 17:38:17 +02:00
parent d343e06d81
commit 26a22667b2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/netconfig/netconfig.go
View File

@ -37,6 +37,9 @@ func subnetMaskSize(mask string) (int, error) {
func applyDhcp4(iface, dir string) error { func applyDhcp4(iface, dir string) error {
b, err := ioutil.ReadFile(filepath.Join(dir, "dhcp4/wire/lease.json")) b, err := ioutil.ReadFile(filepath.Join(dir, "dhcp4/wire/lease.json"))
if err != nil { if err != nil {
if os.IsNotExist(err) {
return nil // dhcp4 might not have obtained a lease yet
}
return err return err
} }
var got dhcp4.Config var got dhcp4.Config
@ -105,6 +108,9 @@ func applyDhcp4(iface, dir string) error {
func applyDhcp6(iface, dir string) error { func applyDhcp6(iface, dir string) error {
b, err := ioutil.ReadFile(filepath.Join(dir, "dhcp6/wire/lease.json")) b, err := ioutil.ReadFile(filepath.Join(dir, "dhcp6/wire/lease.json"))
if err != nil { if err != nil {
if os.IsNotExist(err) {
return nil // dhcp6 might not have obtained a lease yet
}
return err return err
} }
var got dhcp6.Config var got dhcp6.Config