|
6 | 6 | "net"
|
7 | 7 | "time"
|
8 | 8 |
|
| 9 | + "github.com/pkg/errors" |
9 | 10 | log "github.com/sirupsen/logrus"
|
10 | 11 | "github.com/vishvananda/netlink"
|
11 | 12 | "github.com/weaveworks/ignite/pkg/constants"
|
@@ -118,17 +119,17 @@ func bridge(iface *net.Interface) (*DHCPInterface, error) {
|
118 | 119 |
|
119 | 120 | eth, err := netlink.LinkByIndex(iface.Index)
|
120 | 121 | if err != nil {
|
121 |
| - return nil, err |
| 122 | + return nil, errors.Wrap(err, "LinkByIndex") |
122 | 123 | }
|
123 | 124 |
|
124 | 125 | tuntap, err := createTAPAdapter(tapName)
|
125 | 126 | if err != nil {
|
126 |
| - return nil, err |
| 127 | + return nil, errors.Wrap(err, "createTAPAdapter") |
127 | 128 | }
|
128 | 129 |
|
129 | 130 | bridge, err := createBridge(bridgeName)
|
130 | 131 | if err != nil {
|
131 |
| - return nil, err |
| 132 | + return nil, errors.Wrap(err, "createBridge") |
132 | 133 | }
|
133 | 134 |
|
134 | 135 | if err := setMaster(bridge, tuntap, eth); err != nil {
|
@@ -229,7 +230,7 @@ func createBridge(bridgeName string) (*netlink.Bridge, error) {
|
229 | 230 | // the lowest address of an attached device, hence change over time.
|
230 | 231 | mac, err := randomMAC()
|
231 | 232 | if err != nil {
|
232 |
| - return nil, err |
| 233 | + return nil, errors.Wrap(err, "creating random MAC") |
233 | 234 | }
|
234 | 235 | la.HardwareAddr = mac
|
235 | 236 |
|
@@ -263,14 +264,14 @@ func randomMAC() (net.HardwareAddr, error) {
|
263 | 264 | mac[0] = (mac[0] & 0xFE) | 0x02
|
264 | 265 |
|
265 | 266 | return net.HardwareAddr(mac), nil
|
266 |
| - } |
| 267 | +} |
267 | 268 |
|
268 | 269 | func setMaster(master netlink.Link, links ...netlink.Link) error {
|
269 | 270 | masterIndex := master.Attrs().Index
|
270 | 271 |
|
271 | 272 | for _, link := range links {
|
272 | 273 | if err := netlink.LinkSetMasterByIndex(link, masterIndex); err != nil {
|
273 |
| - return err |
| 274 | + return errors.Wrapf(err, "setMaster %s %s", master.Attrs().Name, link.Attrs().Name) |
274 | 275 | }
|
275 | 276 | }
|
276 | 277 |
|
|
0 commit comments