[lxc-devel] [lxd/master] Bugfixes
stgraber on Github
lxc-bot at linuxcontainers.org
Thu Feb 11 17:32:13 UTC 2016
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160211/8ea4e05c/attachment.bin>
-------------- next part --------------
From ea36a259a81b0dcd1e720d59c7ae6739b6031462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 10 Feb 2016 23:06:36 -0500
Subject: [PATCH 1/3] Use upstream go-systemd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This lets us get rid of our current fork. It also means that LXD now
requires Go 1.4 or higher to build.
Closes #1121
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
.travis.yml | 1 -
README.md | 2 +-
lxd/daemon.go | 2 +-
specs/requirements.md | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e0fb058..aada001 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ os:
- osx
go:
- - 1.3
- 1.4
- 1.5
- tip
diff --git a/README.md b/README.md
index f5d2f10..378c264 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ can take your [first steps](#first-steps).
We recommend having the latest versions of liblxc (>= 1.1 required) and CRIU
(>= 1.7 recommended) available for LXD development. Additionally, LXD requires
-Golang 1.3 or later to work. All the right versions dependencies are available
+Golang 1.4 or later to work. All the right versions dependencies are available
via the LXD PPA:
sudo apt-get install software-properties-common
diff --git a/lxd/daemon.go b/lxd/daemon.go
index 9fc34e9..f33ad49 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -24,7 +24,7 @@ import (
"github.com/gorilla/mux"
_ "github.com/mattn/go-sqlite3"
- "github.com/stgraber/lxd-go-systemd/activation"
+ "github.com/coreos/go-systemd/activation"
"github.com/syndtr/gocapability/capability"
"gopkg.in/tomb.v2"
diff --git a/specs/requirements.md b/specs/requirements.md
index dd257f6..441af0b 100644
--- a/specs/requirements.md
+++ b/specs/requirements.md
@@ -1,7 +1,7 @@
# Requirements
## Go
-LXD requires Go 1.3 or higher (soon to become 1.4).
+LXD requires Go 1.4 or higher.
Both the golang and gccgo compilers are supported.
## Kernel requirements
From f0d85060397bcf12a6a5ae7445f45870c9e41c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 10 Feb 2016 23:08:56 -0500
Subject: [PATCH 2/3] specs: Update storage spec for btrfs send/receive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
specs/storage-backends.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/specs/storage-backends.md b/specs/storage-backends.md
index 82ea92d..62a089c 100644
--- a/specs/storage-backends.md
+++ b/specs/storage-backends.md
@@ -9,8 +9,8 @@ Feature | Directory | Btrfs | LVM | ZFS
Optimized image storage | no | yes | yes | yes
Optimized container creation | no | yes | yes | yes
Optimized snapshot creation | no | yes | yes | yes
-Optimized image transfer | no | no | no | yes
-Optimized container transfer | no | no | no | yes
+Optimized image transfer | no | yes | no | yes
+Optimized container transfer | no | yes | no | yes
Copy on write | no | yes | yes | yes
Block based | no | no | yes | no
Instant cloning | no | yes | yes | yes
From c62e3792792739768f241a2e23d6610aa9c4fd75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 11 Feb 2016 12:20:45 -0500
Subject: [PATCH 3/3] lxd-images: Register atexit at init time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
scripts/lxd-images | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/lxd-images b/scripts/lxd-images
index d3ca6e3..56d445c 100755
--- a/scripts/lxd-images
+++ b/scripts/lxd-images
@@ -100,6 +100,7 @@ class LXD(object):
# Create our workdir
self.workdir = tempfile.mkdtemp()
+ atexit.register(self.cleanup)
def cleanup(self):
if self.workdir:
@@ -269,6 +270,7 @@ class Busybox(object):
def __init__(self):
# Create our workdir
self.workdir = tempfile.mkdtemp()
+ atexit.register(self.cleanup)
def cleanup(self):
if self.workdir:
@@ -389,6 +391,8 @@ class Ubuntu(Image):
# Create our workdir
self.workdir = tempfile.mkdtemp()
+ atexit.register(self.cleanup)
+
self.gpgdir = "%s/gpg" % self.workdir
os.mkdir(self.gpgdir, 0o700)
@@ -516,7 +520,6 @@ if __name__ == "__main__":
print(_("LXD isn't running."))
sys.exit(1)
lxd = LXD(lxd_socket)
- atexit.register(lxd.cleanup)
def setup_alias(aliases, fingerprint):
existing = lxd.aliases_list()
@@ -529,7 +532,6 @@ if __name__ == "__main__":
def import_busybox(parser, args):
busybox = Busybox()
- atexit.register(busybox.cleanup)
if args.split:
meta_path, rootfs_path = busybox.create_tarball(split=True)
@@ -580,7 +582,6 @@ if __name__ == "__main__":
image = ubuntu.image_lookup(args.release, args.architecture,
args.version)
- atexit.register(ubuntu.cleanup)
sync = False
if args.sync:
sync = "ubuntu:%s:%s:%s" % (args.stream, args.release,
More information about the lxc-devel
mailing list