Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opencontainers/runc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6262c5e1bf063c2c112ee6d1f9829bc8fa3ec783
Choose a base ref
..
head repository: opencontainers/runc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c5307725cbf988d68197011a90d2c1b19d14a8d6
Choose a head ref
Showing with 2 additions and 3 deletions.
  1. +1 −1 libcontainer/configs/netdevices.go
  2. +1 −1 libcontainer/network_linux.go
  3. +0 −1 tests/integration/netdev.bats
2 changes: 1 addition & 1 deletion libcontainer/configs/netdevices.go
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@ package configs

// LinuxNetDevice represents a single network device to be added to the container's network namespace

Check failure on line 3 in libcontainer/configs/netdevices.go

GitHub Actions / lint

Comment should end in a period (godot)
type LinuxNetDevice struct {
// Name of the device in the container namespace
// Name of the device in the container namespace.
Name string `json:"name,omitempty"`
}
2 changes: 1 addition & 1 deletion libcontainer/network_linux.go
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@ func netnsAttach(name string, nsPath string, device configs.LinuxNetDevice) erro
// and moves to the root network namespace, restoring the original name. It also sets down
// the network device to avoid conflict with existing network configuration.
func netnsDettach(name string, nsPath string, device configs.LinuxNetDevice) error {
logrus.Debugf("dettaching network device %s with attrs %#v to network namespace %s", name, device, nsPath)
logrus.Debugf("detaching network device %s with attrs %#v to network namespace %s", name, device, nsPath)
ns, err := netns.GetFromPath(nsPath)
if err != nil {
return fmt.Errorf("could not get network namespace from path %s for network device %s : %w", nsPath, name, err)
1 change: 0 additions & 1 deletion tests/integration/netdev.bats
Original file line number Diff line number Diff line change
@@ -64,4 +64,3 @@ function teardown() {
[ "$status" -ne 0 ]
[[ "$output" == *"unable to move network devices without a private NET namespace"* ]]
}