[lxc-devel] [lxd/master] actually handle containers list error
The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/2259
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Tycho Andersen
From bfeaf76a039ff273bb3660ad321b6babf1da7c77 Mon Sep 17 00:00:00 2001
From: Tycho Andersen
Date: Tue, 2 Aug 2016 17:30:28 -0600
Subject: [PATCH] actually handle containers list error
Signed-off-by: Tycho Andersen
---
lxd/devices.go | 4
1 file changed, 4 insertions(+)
diff --git a/lxd/devices.go b/lxd/devices.go
index 529450d..ddbcc63 100644
--- a/lxd/devices.go
+++ b/lxd/devices.go
@@ -203,6 +203,10 @@ func deviceTaskBalance(d *Daemon) {
// Iterate through the containers
containers, err := dbContainersList(d.db, cTypeRegular)
+ if err != nil {
+ shared.Log.Error("problem loading containers list",
log.Ctx{"err": err})
+ return
+ }
fixedContainers := map[int][]container{}
balancedContainers := map[container]int{}
for _, name := range containers {
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
[lxc-devel] [lxd/master] remove unused "name" argument from {create, remove}UnixDevice
The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/2258
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Tycho Andersen
From 1a532c736334975cdac6826068c149de4967bd12 Mon Sep 17 00:00:00 2001
From: Tycho Andersen
Date: Tue, 2 Aug 2016 13:06:45 -0600
Subject: [PATCH] remove unused "name" argument from {create,remove}UnixDevice
Signed-off-by: Tycho Andersen
---
lxd/container_lxc.go | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
index ed85235..81aaf65 100644
--- a/lxd/container_lxc.go
+++ b/lxd/container_lxc.go
@@ -1084,7 +1084,7 @@ func (c *containerLXC) startCommon() (string, error) {
for k, m := range c.expandedDevices {
if shared.StringInSlice(m["type"], []string{"unix-char",
"unix-block"}) {
// Unix device
- devPath, err := c.createUnixDevice(k, m)
+ devPath, err := c.createUnixDevice(m)
if err != nil {
return "", err
}
@@ -2425,7 +2425,7 @@ func (c *containerLXC) Update(args containerArgs,
userRequested bool) error {
// Live update the devices
for k, m := range removeDevices {
if shared.StringInSlice(m["type"],
[]string{"unix-char", "unix-block"}) {
- err = c.removeUnixDevice(k, m)
+ err = c.removeUnixDevice(m)
if err != nil {
return err
}
@@ -3542,7 +3542,7 @@ func (c *containerLXC) removeMount(mount string) error {
}
// Unix devices handling
-func (c *containerLXC) createUnixDevice(name string, m shared.Device) (string,
error) {
+func (c *containerLXC) createUnixDevice(m shared.Device) (string, error) {
var err error
var major, minor int
@@ -3654,7 +3654,7 @@ func (c *containerLXC) insertUnixDevice(name string, m
shared.Device) error {
}
// Create the device on the host
- devPath, err := c.createUnixDevice(name, m)
+ devPath, err := c.createUnixDevice(m)
if err != nil {
return fmt.Errorf("Failed to setup device: %s", err)
}
@@ -3679,7 +3679,7 @@ func (c *containerLXC) insertUnixDevice(name string, m
shared.Device) error {
return nil
}
-func (c *containerLXC) removeUnixDevice(name string, m shared.Device) error {
+func (c *containerLXC) removeUnixDevice(m shared.Device) error {
// Check that the container is running
pid := c.InitPID()
if pid == -1 {
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
[lxc-devel] [lxd/master] add /dev/net/tun and /dev/fuse to docs
The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/2257 This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === we supply these devices now, so let's document it Signed-off-by: Tycho Andersen From 4c3a60b51069c2ad0fdd645550ebf83c287c533c Mon Sep 17 00:00:00 2001 From: Tycho Andersen Date: Tue, 2 Aug 2016 08:58:00 -0600 Subject: [PATCH] add /dev/net/tun and /dev/fuse to docs we supply these devices now, so let's document it Signed-off-by: Tycho Andersen --- doc/configuration.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/configuration.md b/doc/configuration.md index 5047daf..35d4647 100644 --- a/doc/configuration.md +++ b/doc/configuration.md @@ -143,6 +143,8 @@ Those includes: - /dev/tty (character device) - /dev/random (character device) - /dev/urandom (character device) + - /dev/net/tun (character device) + - /dev/fuse (character device) - lo (network interface) Anything else has to be defined in the container configuration or in one ___ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel
[lxc-devel] [lxc/lxc] df0739: doc: Add documentation of lxc.syslog to Korean lxc...
Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: df07390b0e6f306e83e4b857d56727ff3504e065 https://github.com/lxc/lxc/commit/df07390b0e6f306e83e4b857d56727ff3504e065 Author: Sungbae Yoo Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M doc/ko/lxc.container.conf.sgml.in Log Message: --- doc: Add documentation of lxc.syslog to Korean lxc.container.conf(5) Update for commit 204dfdf Signed-off-by: Sungbae Yoo Commit: 1e7990d77ccb90f2a170ff41e4fe3e82543f3df3 https://github.com/lxc/lxc/commit/1e7990d77ccb90f2a170ff41e4fe3e82543f3df3 Author: Christian Brauner Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M doc/ko/lxc.container.conf.sgml.in Log Message: --- Merge pull request # from ysbnim/master doc: Add documentation of lxc.syslog to Korean lxc.container.conf(5) Compare: https://github.com/lxc/lxc/compare/d6101a8f22c2...1e7990d77ccb___ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel
