Skip to content

Commit 947d98a

Browse files
committed
Update copyright year 2022->2023
1 parent 77c0caf commit 947d98a

18 files changed

+23
-20
lines changed

Diff for: cmd/network-broker/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package main
55

Diff for: listeners/dhclient.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package listeners
55

@@ -55,7 +55,7 @@ func setDnsDomain(dnsDomains []string, index int) error {
5555
return nil
5656
}
5757

58-
func executeDHClientLinkStateScripts(n *network.Network, link string, strIndex string, dns string, domain string, lease string, c *conf.Config) error {
58+
func executeDHClientLinkStateScripts(n *network.Network, link string, strIndex string, dns string, domain string, domainSearch string, lease string, c *conf.Config) error {
5959
scripts, err := system.ReadAllScriptInConfDir(path.Join(conf.ConfPath, "routable.d"))
6060
if err != nil {
6161
log.Errorf("Failed to read script dir: %+v", err)
@@ -68,6 +68,7 @@ func executeDHClientLinkStateScripts(n *network.Network, link string, strIndex s
6868
if err == nil {
6969
m.DNS = []string{dns}
7070
m.Domains = []string{domain}
71+
m.DomainSearch = []string{domainSearch}
7172

7273
j, _ := json.Marshal(m)
7374
jsonData = "JSON=" + string(j)
@@ -134,10 +135,11 @@ func TaskDHClient(n *network.Network, c *conf.Config) error {
134135

135136
dns := strings.Join(lease.Dns, ",")
136137
domain := strings.Join(lease.Domain, ",")
138+
domainSearch := strings.Join(lease.DomainSearch, ",")
137139
strings.Join(lease.Domain, ",")
138140
dhcpLease := "DHCP_LEASE=" + "ADDRESS=" + lease.Address + ",DNS=" + strings.Join(lease.Dns, ",") + ",ROUTER=" + lease.Routers + ",SUBNETMASK=" + lease.SubnetMask + ",DNS=" + dns + ",DOMAIN=" + domain
139141

140-
executeDHClientLinkStateScripts(n, i, strIndex, dns, domain, dhcpLease, c)
142+
executeDHClientLinkStateScripts(n, i, strIndex, dns, domain, domainSearch, dhcpLease, c)
141143

142144
if c.Network.UseHostname {
143145
if err := bus.SetHostname(lease.Hostname); err != nil {

Diff for: listeners/json.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package listeners
55

@@ -105,6 +105,7 @@ type LinkDescribe struct {
105105
NetworkFile string `json:"NetworkFile,omitempty"`
106106
DNS []string `json:"DNS"`
107107
Domains []string `json:"Domains"`
108+
DomainSearch []string `json:"DomainSearch"`
108109
NTP []string `json:"NTP"`
109110

110111
Addresses []Address `json:"Address"`

Diff for: listeners/networkd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package listeners
55

Diff for: listeners/networkd_api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package listeners
55

Diff for: listeners/networkd_dbus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package listeners
55

Diff for: pkg/bus/dbus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package bus
55

Diff for: pkg/conf/conf.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package conf
55

Diff for: pkg/network/address.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 VMware, Inc.
1+
// Copyright 2023 VMware, Inc.
22
// SPDX-License-Identifier: Apache-2.0
33

44
package network

Diff for: pkg/network/link.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44

55
package network

Diff for: pkg/network/network.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package network
55

Diff for: pkg/network/route.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 VMware, Inc.
1+
// Copyright 2023 VMware, Inc.
22
// SPDX-License-Identifier: Apache-2.0
33

44
package network

Diff for: pkg/network/routing_policy_rule.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 VMware, Inc.
1+
// Copyright 2023 VMware, Inc.
22
// SPDX-License-Identifier: Apache-2.0
33

44
package network

Diff for: pkg/network/watch_network.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44
package network
55

Diff for: pkg/parser/parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 VMware, Inc.
1+
// Copyright 2023 VMware, Inc.
22
// SPDX-License-Identifier: Apache-2.0
33

44
package parser

Diff for: pkg/system/capability.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 VMware, Inc.
1+
// Copyright 2023 VMware, Inc.
22
// SPDX-License-Identifier: Apache-2.0
33

44
package system

Diff for: pkg/system/path.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
// Copyright 2022 VMware, Inc.
2+
// Copyright 2023 VMware, Inc.
33

44

55
package system

Diff for: pkg/system/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 VMware, Inc.
1+
// Copyright 2023 VMware, Inc.
22
// SPDX-License-Identifier: Apache-2.0
33

44
package system

0 commit comments

Comments
 (0)