summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Mackdanz <stasibear@gentoo.org>2016-02-03 17:53:43 -0600
committerErik Mackdanz <stasibear@gentoo.org>2016-02-03 17:53:43 -0600
commitfcd3f868b93b6e707841fdce724155795071e1cd (patch)
treee6d7b7338d56bc7bd87bb9f462600ce88bc6e5e8 /app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch
parentprofiles: Mask dev-java/concurrent-util (diff)
downloadgentoo-fcd3f868b93b6e707841fdce724155795071e1cd.tar.gz
gentoo-fcd3f868b93b6e707841fdce724155795071e1cd.tar.bz2
gentoo-fcd3f868b93b6e707841fdce724155795071e1cd.zip
app-emulation/lxd: bump to 2.0.0_beta1
Package-Manager: portage-2.2.27
Diffstat (limited to 'app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch')
-rw-r--r--app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch
new file mode 100644
index 000000000000..9655e5ebb182
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch
@@ -0,0 +1,17 @@
+--- a/lxd/container_lxc.go
++++ b/lxd/container_lxc.go
+@@ -3509,8 +3509,13 @@ func (c *containerLXC) getDiskLimits() (map[string]deviceBlockLimit, error) {
+
+ for _, block := range blocks {
+ dev := strings.TrimPrefix(block, "/dev/")
++
++ if strings.Contains(dev,"/") {
++ continue
++ }
++
+ if !shared.PathExists(fmt.Sprintf("/sys/class/block/%s/dev", dev)) {
+- return nil, fmt.Errorf("Disk is missing /sys/class/block entry")
++ return nil, fmt.Errorf("Disk %s is missing /sys/class/block entry", dev)
+ }
+
+ block, err := ioutil.ReadFile(fmt.Sprintf("/sys/class/block/%s/dev", dev))