Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
fleet
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Go Packaging Team
packages
fleet
Commits
d8d83e5c
Commit
d8d83e5c
authored
9 years ago
by
onlyjob
Browse files
Options
Downloads
Patches
Plain Diff
Switch to vishvananda-netlink, fixes FTBFS (Closes: #817025)
parent
ec226552
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
debian/control
+1
-1
1 addition, 1 deletion
debian/control
debian/patches/netlink.patch
+54
-0
54 additions, 0 deletions
debian/patches/netlink.patch
debian/patches/runc.patch
+0
-19
0 additions, 19 deletions
debian/patches/runc.patch
debian/patches/series
+1
-1
1 addition, 1 deletion
debian/patches/series
with
56 additions
and
21 deletions
debian/control
+
1
−
1
View file @
d8d83e5c
...
...
@@ -11,9 +11,9 @@ Build-Depends: debhelper (>= 9), bash-completion,
golang-dbus-dev,
golang-etcd-server-dev | golang-github-coreos-etcd-dev,
golang-github-coreos-go-systemd-dev,
golang-github-opencontainers-runc-dev,
golang-github-rakyll-globalconf-dev,
golang-github-ugorji-go-codec-dev,
golang-github-vishvananda-netlink-dev,
golang-go,
golang-go-semver-dev,
golang-go.crypto-dev,
...
...
This diff is collapsed.
Click to expand it.
debian/patches/netlink.patch
0 → 100644
+
54
−
0
View file @
d8d83e5c
Last-Update: 2016-03-06
Forwarded: yes
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803496
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817025
Bug-Upstream: https://github.com/coreos/fleet/issues/1468
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: update netlink dependency.
--- a/machine/coreos.go
+++ b/machine/coreos.go
@@ -22,9 +22,9 @@
"strings"
"sync"
"time"
- "github.com/coreos/fleet/Godeps/_workspace/src/github.com/docker/libcontainer/netlink"
+ "github.com/vishvananda/netlink"
"github.com/coreos/fleet/log"
"github.com/coreos/fleet/unit"
)
@@ -169,9 +169,9 @@
func getDefaultGatewayIface() *net.Interface {
log.Debug("Attempting to retrieve IP route info from netlink")
- routes, err := netlink.NetworkGetRoutes()
+ routes, err := netlink.RouteList(nil, 0)
if err != nil {
log.Debugf("Unable to detect default interface: %v", err)
return nil
}
@@ -181,14 +181,17 @@
return nil
}
for _, route := range routes {
- if route.Default {
- if route.Iface == nil {
+ // a nil Dst means that this is the default route.
+ if route.Dst == nil {
+ i, err := net.InterfaceByIndex(route.LinkIndex)
+ if err != nil {
log.Debugf("Found default route but could not determine interface")
+ continue
}
- log.Debugf("Found default route with interface %v", route.Iface.Name)
- return route.Iface
+ log.Debugf("Found default route with interface %v", i)
+ return i
}
}
log.Debugf("Unable to find default route")
This diff is collapsed.
Click to expand it.
debian/patches/runc.patch
deleted
100644 → 0
+
0
−
19
View file @
ec226552
Last-Update: 2015-10-31
Forwarded: no
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803496
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: switch to runc
--- a/machine/coreos.go
+++ b/machine/coreos.go
@@ -22,9 +22,9 @@
"strings"
"sync"
"time"
- "github.com/coreos/fleet/Godeps/_workspace/src/github.com/docker/libcontainer/netlink"
+ "github.com/opencontainers/runc/libcontainer/netlink"
"github.com/coreos/fleet/log"
"github.com/coreos/fleet/unit"
)
This diff is collapsed.
Click to expand it.
debian/patches/series
+
1
−
1
View file @
d8d83e5c
runc
.patch
netlink
.patch
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment