app-emulation/lxd: bump to 2.0.0_beta1

Package-Manager: portage-2.2.27

5 files changed, 125 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))
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch
new file mode 100644
index 000000000000..9964af6aec43
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	2015-12-28 19:23:28.425122306 -0600
++++ Makefile	2015-12-28 19:25:09.482123654 -0600
+@@ -12,17 +12,11 @@
+ 
+ .PHONY: default
+ default:
+-	# Must run twice due to go get race
+-	-go get -t -v -d ./...
+-	-go get -t -v -d ./...
+ 	go install -v ./...
+ 	@echo "LXD built succesfuly"
+ 
+ .PHONY: client
+ client:
+-	# Must run twice due to go get race
+-	-go get -t -v -d ./...
+-	-go get -t -v -d ./...
+ 	go install -v ./lxc
+ 	@echo "LXD client built succesfuly"
+ 
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch
new file mode 100644
index 000000000000..7373b66969b7
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig	2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go	2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ 	 * command (i.e. the command to run on --server). However, we're
+ 	 * hardcoding that at the other end, so we can just ignore it.
+ 	 */
+-	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ 	cmd := exec.Command(
+ 		"rsync",
+ 		"-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1.confd b/app-emulation/lxd/files/lxd-2.0.0_beta1.confd
new file mode 100644
index 000000000000..3d553276a5e3
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1.confd
@@ -0,0 +1,27 @@
+# Group which owns the shared socket
+LXD_OPTIONS+=" --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1.initd b/app-emulation/lxd/files/lxd-2.0.0_beta1.initd
new file mode 100644
index 000000000000..ec23258c19d1
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1.initd
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+    need net
+    use lxcfs
+
+    # remove with 2.0 release
+    need cgmanager
+}
+
+start() {
+    ebegin "Starting lxd server"
+
+    start-stop-daemon --start \
+		      --pidfile ${PIDFILE} \
+		      --exec ${DAEMON} \
+		      --background \
+		      --make-pidfile \
+		      -- \
+		      ${LXD_OPTIONS}
+
+    eend $?
+}
+
+stop() {
+    if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+	stopall
+    else
+	ebegin "Stopping lxd service (but not containers)"
+	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+	eend $?
+    fi
+}
+
+stopall() {
+    ebegin "Stopping lxd service and containers"
+    if "${DAEMON}" shutdown; then
+	/etc/init.d/lxd zap
+	rm -f ${PIDFILE}
+    fi
+    eend $?
+}