@@ -89,7 +89,7 @@ LDFLAGS='

 '

 LDFLAGS_STATIC='-linkmode external'

 EXTLDFLAGS_STATIC='-static'

-BUILDFLAGS=( -a -tags "netgo $DOCKER_BUILDTAGS" )

+BUILDFLAGS=( -a -tags "netgo static_build $DOCKER_BUILDTAGS" )

 # A few more flags that are specific just to building a completely-static binary (see hack/make/binary)

 # PLEASE do not use these anywhere else.

@@ -58,3 +58,6 @@ mv src/code.google.com/p/go/src/pkg/archive/tar tmp-tar

 rm -rf src/code.google.com/p/go

 mkdir -p src/code.google.com/p/go/src/pkg/archive

 mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar

+

+clone git github.com/godbus/dbus cb98efbb933d8389ab549a060e880ea3c375d213

+clone git github.com/coreos/go-systemd 4c14ed39b8a643ac44b4f95b5a53c00e94261475

new file mode 100644

@@ -0,0 +1,8 @@

+language: go

+go: 1.2

+

+install:

+ - echo "Skip install"

+

+script:

+ - ./test

new file mode 100644

@@ -0,0 +1,191 @@

+Apache License

+Version 2.0, January 2004

+http://www.apache.org/licenses/

+

+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

+1. Definitions.

+

+"License" shall mean the terms and conditions for use, reproduction, and

+distribution as defined by Sections 1 through 9 of this document.

+

+"Licensor" shall mean the copyright owner or entity authorized by the copyright

+owner that is granting the License.

+

+"Legal Entity" shall mean the union of the acting entity and all other entities

+that control, are controlled by, or are under common control with that entity.

+For the purposes of this definition, "control" means (i) the power, direct or

+indirect, to cause the direction or management of such entity, whether by

+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the

+outstanding shares, or (iii) beneficial ownership of such entity.

+

+"You" (or "Your") shall mean an individual or Legal Entity exercising

+permissions granted by this License.

+

+"Source" form shall mean the preferred form for making modifications, including

+but not limited to software source code, documentation source, and configuration

+files.

+

+"Object" form shall mean any form resulting from mechanical transformation or

+translation of a Source form, including but not limited to compiled object code,

+generated documentation, and conversions to other media types.

+

+"Work" shall mean the work of authorship, whether in Source or Object form, made

+available under the License, as indicated by a copyright notice that is included

+in or attached to the work (an example is provided in the Appendix below).

+

+"Derivative Works" shall mean any work, whether in Source or Object form, that

+is based on (or derived from) the Work and for which the editorial revisions,

+annotations, elaborations, or other modifications represent, as a whole, an

+original work of authorship. For the purposes of this License, Derivative Works

+shall not include works that remain separable from, or merely link (or bind by

+name) to the interfaces of, the Work and Derivative Works thereof.

+

+"Contribution" shall mean any work of authorship, including the original version

+of the Work and any modifications or additions to that Work or Derivative Works

+thereof, that is intentionally submitted to Licensor for inclusion in the Work

+by the copyright owner or by an individual or Legal Entity authorized to submit

+on behalf of the copyright owner. For the purposes of this definition,

+"submitted" means any form of electronic, verbal, or written communication sent

+to the Licensor or its representatives, including but not limited to

+communication on electronic mailing lists, source code control systems, and

+issue tracking systems that are managed by, or on behalf of, the Licensor for

+the purpose of discussing and improving the Work, but excluding communication

+that is conspicuously marked or otherwise designated in writing by the copyright

+owner as "Not a Contribution."

+

+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf

+of whom a Contribution has been received by Licensor and subsequently

+incorporated within the Work.

+

+2. Grant of Copyright License.

+

+Subject to the terms and conditions of this License, each Contributor hereby

+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,

+irrevocable copyright license to reproduce, prepare Derivative Works of,

+publicly display, publicly perform, sublicense, and distribute the Work and such

+Derivative Works in Source or Object form.

+

+3. Grant of Patent License.

+

+Subject to the terms and conditions of this License, each Contributor hereby

+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,

+irrevocable (except as stated in this section) patent license to make, have

+made, use, offer to sell, sell, import, and otherwise transfer the Work, where

+such license applies only to those patent claims licensable by such Contributor

+that are necessarily infringed by their Contribution(s) alone or by combination

+of their Contribution(s) with the Work to which such Contribution(s) was

+submitted. If You institute patent litigation against any entity (including a

+cross-claim or counterclaim in a lawsuit) alleging that the Work or a

+Contribution incorporated within the Work constitutes direct or contributory

+patent infringement, then any patent licenses granted to You under this License

+for that Work shall terminate as of the date such litigation is filed.

+

+4. Redistribution.

+

+You may reproduce and distribute copies of the Work or Derivative Works thereof

+in any medium, with or without modifications, and in Source or Object form,

+provided that You meet the following conditions:

+

+You must give any other recipients of the Work or Derivative Works a copy of

+this License; and

+You must cause any modified files to carry prominent notices stating that You

+changed the files; and

+You must retain, in the Source form of any Derivative Works that You distribute,

+all copyright, patent, trademark, and attribution notices from the Source form

+of the Work, excluding those notices that do not pertain to any part of the

+Derivative Works; and

+If the Work includes a "NOTICE" text file as part of its distribution, then any

+Derivative Works that You distribute must include a readable copy of the

+attribution notices contained within such NOTICE file, excluding those notices

+that do not pertain to any part of the Derivative Works, in at least one of the

+following places: within a NOTICE text file distributed as part of the

+Derivative Works; within the Source form or documentation, if provided along

+with the Derivative Works; or, within a display generated by the Derivative

+Works, if and wherever such third-party notices normally appear. The contents of

+the NOTICE file are for informational purposes only and do not modify the

+License. You may add Your own attribution notices within Derivative Works that

+You distribute, alongside or as an addendum to the NOTICE text from the Work,

+provided that such additional attribution notices cannot be construed as

+modifying the License.

+You may add Your own copyright statement to Your modifications and may provide

+additional or different license terms and conditions for use, reproduction, or

+distribution of Your modifications, or for any such Derivative Works as a whole,

+provided Your use, reproduction, and distribution of the Work otherwise complies

+with the conditions stated in this License.

+

+5. Submission of Contributions.

+

+Unless You explicitly state otherwise, any Contribution intentionally submitted

+for inclusion in the Work by You to the Licensor shall be under the terms and

+conditions of this License, without any additional terms or conditions.

+Notwithstanding the above, nothing herein shall supersede or modify the terms of

+any separate license agreement you may have executed with Licensor regarding

+such Contributions.

+

+6. Trademarks.

+

+This License does not grant permission to use the trade names, trademarks,

+service marks, or product names of the Licensor, except as required for

+reasonable and customary use in describing the origin of the Work and

+reproducing the content of the NOTICE file.

+

+7. Disclaimer of Warranty.

+

+Unless required by applicable law or agreed to in writing, Licensor provides the

+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,

+including, without limitation, any warranties or conditions of TITLE,

+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are

+solely responsible for determining the appropriateness of using or

+redistributing the Work and assume any risks associated with Your exercise of

+permissions under this License.

+

+8. Limitation of Liability.

+

+In no event and under no legal theory, whether in tort (including negligence),

+contract, or otherwise, unless required by applicable law (such as deliberate

+and grossly negligent acts) or agreed to in writing, shall any Contributor be

+liable to You for damages, including any direct, indirect, special, incidental,

+or consequential damages of any character arising as a result of this License or

+out of the use or inability to use the Work (including but not limited to

+damages for loss of goodwill, work stoppage, computer failure or malfunction, or

+any and all other commercial damages or losses), even if such Contributor has

+been advised of the possibility of such damages.

+

+9. Accepting Warranty or Additional Liability.

+

+While redistributing the Work or Derivative Works thereof, You may choose to

+offer, and charge a fee for, acceptance of support, warranty, indemnity, or

+other liability obligations and/or rights consistent with this License. However,

+in accepting such obligations, You may act only on Your own behalf and on Your

+sole responsibility, not on behalf of any other Contributor, and only if You

+agree to indemnify, defend, and hold each Contributor harmless for any liability

+incurred by, or claims asserted against, such Contributor by reason of your

+accepting any such warranty or additional liability.

+

+END OF TERMS AND CONDITIONS

+

+APPENDIX: How to apply the Apache License to your work

+

+To apply the Apache License to your work, attach the following boilerplate

+notice, with the fields enclosed by brackets "[]" replaced with your own

+identifying information. (Don't include the brackets!) The text should be

+enclosed in the appropriate comment syntax for the file format. We also

+recommend that a file or class name and description of purpose be included on

+the same "printed page" as the copyright notice for easier identification within

+third-party archives.

+

+   Copyright [yyyy] [name of copyright owner]

+

+   Licensed under the Apache License, Version 2.0 (the "License");

+   you may not use this file except in compliance with the License.

+   You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

new file mode 100644

@@ -0,0 +1,44 @@

+# go-systemd

+

+Go bindings to systemd. The project has three packages:

+

+- activation - for writing and using socket activation from Go

+- journal - for writing to systemd's logging service, journal

+- dbus - for starting/stopping/inspecting running services and units

+

+Go docs for the entire project are here:

+

+http://godoc.org/github.com/coreos/go-systemd

+

+## Socket Activation

+

+An example HTTP server using socket activation can be quickly setup by

+following this README on a Linux machine running systemd:

+

+https://github.com/coreos/go-systemd/tree/master/examples/activation/httpserver

+

+## Journal

+

+Using this package you can submit journal entries directly to systemd's journal taking advantage of features like indexed key/value pairs for each log entry.

+

+## D-Bus

+

+The D-Bus API lets you start, stop and introspect systemd units. The API docs are here:

+

+http://godoc.org/github.com/coreos/go-systemd/dbus

+

+### Debugging

+

+Create `/etc/dbus-1/system-local.conf` that looks like this:

+

+```

+<!DOCTYPE busconfig PUBLIC

+"-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"

+"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">

+<busconfig>

+    <policy user="root">

+        <allow eavesdrop="true"/>

+        <allow eavesdrop="true" send_destination="*"/>

+    </policy>

+</busconfig>

+```

new file mode 100644

@@ -0,0 +1,56 @@

+/*

+Copyright 2013 CoreOS Inc.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

+// Package activation implements primitives for systemd socket activation.

+package activation

+

+import (

+	"os"

+	"strconv"

+	"syscall"

+)

+

+// based on: https://gist.github.com/alberts/4640792

+const (

+	listenFdsStart = 3

+)

+

+func Files(unsetEnv bool) []*os.File {

+	if unsetEnv {

+		// there is no way to unset env in golang os package for now

+		// https://code.google.com/p/go/issues/detail?id=6423

+		defer os.Setenv("LISTEN_PID", "")

+		defer os.Setenv("LISTEN_FDS", "")

+	}

+

+	pid, err := strconv.Atoi(os.Getenv("LISTEN_PID"))

+	if err != nil || pid != os.Getpid() {

+		return nil

+	}

+

+	nfds, err := strconv.Atoi(os.Getenv("LISTEN_FDS"))

+	if err != nil || nfds == 0 {

+		return nil

+	}

+

+	var files []*os.File

+	for fd := listenFdsStart; fd < listenFdsStart+nfds; fd++ {

+		syscall.CloseOnExec(fd)

+		files = append(files, os.NewFile(uintptr(fd), "LISTEN_FD_"+strconv.Itoa(fd)))

+	}

+

+	return files

+}

new file mode 100644

@@ -0,0 +1,84 @@

+/*

+Copyright 2013 CoreOS Inc.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

+package activation

+

+import (

+	"bytes"

+	"io"

+	"os"

+	"os/exec"

+	"testing"

+)

+

+// correctStringWritten fails the text if the correct string wasn't written

+// to the other side of the pipe.

+func correctStringWritten(t *testing.T, r *os.File, expected string) bool {

+	bytes := make([]byte, len(expected))

+	io.ReadAtLeast(r, bytes, len(expected))

+

+	if string(bytes) != expected {

+		t.Fatalf("Unexpected string %s", string(bytes))

+	}

+

+	return true

+}

+

+// TestActivation forks out a copy of activation.go example and reads back two

+// strings from the pipes that are passed in.

+func TestActivation(t *testing.T) {

+	cmd := exec.Command("go", "run", "../examples/activation/activation.go")

+

+	r1, w1, _ := os.Pipe()

+	r2, w2, _ := os.Pipe()

+	cmd.ExtraFiles = []*os.File{

+		w1,

+		w2,

+	}

+

+	cmd.Env = os.Environ()

+	cmd.Env = append(cmd.Env, "LISTEN_FDS=2", "FIX_LISTEN_PID=1")

+

+	err := cmd.Run()

+	if err != nil {

+		t.Fatalf(err.Error())

+	}

+

+	correctStringWritten(t, r1, "Hello world")

+	correctStringWritten(t, r2, "Goodbye world")

+}

+

+func TestActivationNoFix(t *testing.T) {

+	cmd := exec.Command("go", "run", "../examples/activation/activation.go")

+	cmd.Env = os.Environ()

+	cmd.Env = append(cmd.Env, "LISTEN_FDS=2")

+

+	out, _ := cmd.CombinedOutput()

+	if bytes.Contains(out, []byte("No files")) == false {

+		t.Fatalf("Child didn't error out as expected")

+	}

+}

+

+func TestActivationNoFiles(t *testing.T) {

+	cmd := exec.Command("go", "run", "../examples/activation/activation.go")

+	cmd.Env = os.Environ()

+	cmd.Env = append(cmd.Env, "LISTEN_FDS=0", "FIX_LISTEN_PID=1")

+

+	out, _ := cmd.CombinedOutput()

+	if bytes.Contains(out, []byte("No files")) == false {

+		t.Fatalf("Child didn't error out as expected")

+	}

+}

new file mode 100644

@@ -0,0 +1,38 @@

+/*

+Copyright 2014 CoreOS Inc.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

+package activation

+

+import (

+	"fmt"

+	"net"

+)

+

+// Listeners returns net.Listeners for all socket activated fds passed to this process.

+func Listeners(unsetEnv bool) ([]net.Listener, error) {

+	files := Files(unsetEnv)

+	listeners := make([]net.Listener, len(files))

+

+	for i, f := range files {

+		var err error

+		listeners[i], err = net.FileListener(f)

+		if err != nil {

+			return nil, fmt.Errorf("Error setting up FileListener for fd %d: %s", f.Fd(), err.Error())

+		}

+	}

+

+	return listeners, nil

+}

new file mode 100644

@@ -0,0 +1,88 @@

+/*

+Copyright 2014 CoreOS Inc.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

+package activation

+

+import (

+	"io"

+	"net"

+	"os"

+	"os/exec"

+	"testing"

+)

+

+// correctStringWritten fails the text if the correct string wasn't written

+// to the other side of the pipe.

+func correctStringWrittenNet(t *testing.T, r net.Conn, expected string) bool {

+	bytes := make([]byte, len(expected))

+	io.ReadAtLeast(r, bytes, len(expected))

+

+	if string(bytes) != expected {

+		t.Fatalf("Unexpected string %s", string(bytes))

+	}

+

+	return true

+}

+

+// TestActivation forks out a copy of activation.go example and reads back two

+// strings from the pipes that are passed in.

+func TestListeners(t *testing.T) {

+	cmd := exec.Command("go", "run", "../examples/activation/listen.go")

+

+	l1, err := net.Listen("tcp", ":9999")

+	if err != nil {

+		t.Fatalf(err.Error())

+	}

+	l2, err := net.Listen("tcp", ":1234")

+	if err != nil {

+		t.Fatalf(err.Error())

+	}

+

+	t1 := l1.(*net.TCPListener)

+	t2 := l2.(*net.TCPListener)

+

+	f1, _ := t1.File()

+	f2, _  := t2.File()

+

+	cmd.ExtraFiles = []*os.File{

+		f1,

+		f2,

+	}

+

+	r1, err := net.Dial("tcp", "127.0.0.1:9999")

+	if err != nil {

+		t.Fatalf(err.Error())

+	}

+	r1.Write([]byte("Hi"))

+

+	r2, err := net.Dial("tcp", "127.0.0.1:1234")

+	if err != nil {

+		t.Fatalf(err.Error())

+	}

+	r2.Write([]byte("Hi"))

+

+	cmd.Env = os.Environ()

+	cmd.Env = append(cmd.Env, "LISTEN_FDS=2", "FIX_LISTEN_PID=1")

+

+	out, err := cmd.Output()

+	if err != nil {

+		println(string(out))

+		t.Fatalf(err.Error())

+	}

+

+	correctStringWrittenNet(t, r1, "Hello world")

+	correctStringWrittenNet(t, r2, "Goodbye world")

+}

new file mode 100644

@@ -0,0 +1,104 @@

+/*

+Copyright 2013 CoreOS Inc.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

+// Integration with the systemd D-Bus API.  See http://www.freedesktop.org/wiki/Software/systemd/dbus/

+package dbus

+

+import (

+	"os"

+	"strconv"

+	"strings"

+	"sync"

+

+	"github.com/godbus/dbus"

+)

+

+const signalBuffer = 100

+

+// ObjectPath creates a dbus.ObjectPath using the rules that systemd uses for

+// serializing special characters.

+func ObjectPath(path string) dbus.ObjectPath {

+	path = strings.Replace(path, ".", "_2e", -1)

+	path = strings.Replace(path, "-", "_2d", -1)

+	path = strings.Replace(path, "@", "_40", -1)

+

+	return dbus.ObjectPath(path)

+}

+

+// Conn is a connection to systemds dbus endpoint.

+type Conn struct {

+	sysconn     *dbus.Conn

+	sysobj      *dbus.Object

+	jobListener struct {

+		jobs map[dbus.ObjectPath]chan string

+		sync.Mutex

+	}

+	subscriber struct {

+		updateCh chan<- *SubStateUpdate

+		errCh    chan<- error

+		sync.Mutex

+		ignore      map[dbus.ObjectPath]int64

+		cleanIgnore int64

+	}

+	dispatch map[string]func(dbus.Signal)

+}

+

+// New() establishes a connection to the system bus and authenticates.

+func New() (*Conn, error) {

+	c := new(Conn)

+

+	if err := c.initConnection(); err != nil {

+		return nil, err

+	}

+

+	c.initJobs()

+	return c, nil

+}

+

+func (c *Conn) initConnection() error {

+	var err error

+	c.sysconn, err = dbus.SystemBusPrivate()

+	if err != nil {

+		return err

+	}

+

+	// Only use EXTERNAL method, and hardcode the uid (not username)

+	// to avoid a username lookup (which requires a dynamically linked

+	// libc)

+	methods := []dbus.Auth{dbus.AuthExternal(strconv.Itoa(os.Getuid()))}

+

+	err = c.sysconn.Auth(methods)

+	if err != nil {

+		c.sysconn.Close()

+		return err

+	}

+

+	err = c.sysconn.Hello()

+	if err != nil {

+		c.sysconn.Close()

+		return err

+	}

+

+	c.sysobj = c.sysconn.Object("org.freedesktop.systemd1", dbus.ObjectPath("/org/freedesktop/systemd1"))

+

+	// Setup the listeners on jobs so that we can get completions

+	c.sysconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,

+		"type='signal', interface='org.freedesktop.systemd1.Manager', member='JobRemoved'")

+	c.initSubscription()

+	c.initDispatch()

+

+	return nil

+}

new file mode 100644

@@ -0,0 +1,41 @@

+/*

+Copyright 2013 CoreOS Inc.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

+package dbus

+

+import (

+	"testing"

+)

+

+// TestObjectPath ensures path encoding of the systemd rules works.

+func TestObjectPath(t *testing.T) {

+	input := "/silly-path/to@a/unit..service"

+	output := ObjectPath(input)

+	expected := "/silly_2dpath/to_40a/unit_2e_2eservice"

+

+	if string(output) != expected {

+		t.Fatalf("Output '%s' did not match expected '%s'", output, expected)

+	}

+}

+

+// TestNew ensures that New() works without errors.

+func TestNew(t *testing.T) {

+	_, err := New()

+

+	if err != nil {

+		t.Fatal(err)

+	}

+}

new file mode 100644

@@ -0,0 +1,354 @@

+/*

+Copyright 2013 CoreOS Inc.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

+package dbus

+

+import (

+	"errors"

+	"github.com/godbus/dbus"

+)

+

+func (c *Conn) initJobs() {

+	c.jobListener.jobs = make(map[dbus.ObjectPath]chan string)

+}

+

+func (c *Conn) jobComplete(signal *dbus.Signal) {

+	var id uint32

+	var job dbus.ObjectPath

+	var unit string

+	var result string

+	dbus.Store(signal.Body, &id, &job, &unit, &result)

+	c.jobListener.Lock()

+	out, ok := c.jobListener.jobs[job]

+	if ok {

+		out <- result

+		delete(c.jobListener.jobs, job)

+	}

+	c.jobListener.Unlock()

+}

+

+func (c *Conn) startJob(job string, args ...interface{}) (<-chan string, error) {

+	c.jobListener.Lock()

+	defer c.jobListener.Unlock()

+

+	ch := make(chan string, 1)

+	var path dbus.ObjectPath

+	err := c.sysobj.Call(job, 0, args...).Store(&path)

+	if err != nil {

+		return nil, err

+	}

+	c.jobListener.jobs[path] = ch

+	return ch, nil

+}

+

+func (c *Conn) runJob(job string, args ...interface{}) (string, error) {

+	respCh, err := c.startJob(job, args...)

+	if err != nil {

+		return "", err

+	}

+	return <-respCh, nil

+}

+

+// StartUnit enqeues a start job and depending jobs, if any (unless otherwise

+// specified by the mode string).

+//

+// Takes the unit to activate, plus a mode string. The mode needs to be one of

+// replace, fail, isolate, ignore-dependencies, ignore-requirements. If

+// "replace" the call will start the unit and its dependencies, possibly

+// replacing already queued jobs that conflict with this. If "fail" the call

+// will start the unit and its dependencies, but will fail if this would change

+// an already queued job. If "isolate" the call will start the unit in question

+// and terminate all units that aren't dependencies of it. If

+// "ignore-dependencies" it will start a unit but ignore all its dependencies.

+// If "ignore-requirements" it will start a unit but only ignore the

+// requirement dependencies. It is not recommended to make use of the latter

+// two options.

+//

+// Result string: one of done, canceled, timeout, failed, dependency, skipped.

+// done indicates successful execution of a job. canceled indicates that a job

+// has been canceled  before it finished execution. timeout indicates that the

+// job timeout was reached. failed indicates that the job failed. dependency

+// indicates that a job this job has been depending on failed and the job hence

+// has been removed too. skipped indicates that a job was skipped because it

+// didn't apply to the units current state.

+func (c *Conn) StartUnit(name string, mode string) (string, error) {

+	return c.runJob("org.freedesktop.systemd1.Manager.StartUnit", name, mode)

+}

+

+// StopUnit is similar to StartUnit but stops the specified unit rather

+// than starting it.

+func (c *Conn) StopUnit(name string, mode string) (string, error) {

+	return c.runJob("org.freedesktop.systemd1.Manager.StopUnit", name, mode)

+}

+

+// ReloadUnit reloads a unit.  Reloading is done only if the unit is already running and fails otherwise.

+func (c *Conn) ReloadUnit(name string, mode string) (string, error) {

+	return c.runJob("org.freedesktop.systemd1.Manager.ReloadUnit", name, mode)

+}

+

+// RestartUnit restarts a service.  If a service is restarted that isn't

+// running it will be started.

+func (c *Conn) RestartUnit(name string, mode string) (string, error) {

+	return c.runJob("org.freedesktop.systemd1.Manager.RestartUnit", name, mode)

+}

+

+// TryRestartUnit is like RestartUnit, except that a service that isn't running

+// is not affected by the restart.

+func (c *Conn) TryRestartUnit(name string, mode string) (string, error) {

+	return c.runJob("org.freedesktop.systemd1.Manager.TryRestartUnit", name, mode)

+}

+

+// ReloadOrRestart attempts a reload if the unit supports it and use a restart

+// otherwise.

+func (c *Conn) ReloadOrRestartUnit(name string, mode string) (string, error) {

+	return c.runJob("org.freedesktop.systemd1.Manager.ReloadOrRestartUnit", name, mode)

+}

+

+// ReloadOrTryRestart attempts a reload if the unit supports it and use a "Try"

+// flavored restart otherwise.

+func (c *Conn) ReloadOrTryRestartUnit(name string, mode string) (string, error) {

+	return c.runJob("org.freedesktop.systemd1.Manager.ReloadOrTryRestartUnit", name, mode)

+}

+

+// StartTransientUnit() may be used to create and start a transient unit, which

+// will be released as soon as it is not running or referenced anymore or the

+// system is rebooted. name is the unit name including suffix, and must be

+// unique. mode is the same as in StartUnit(), properties contains properties

+// of the unit.

+func (c *Conn) StartTransientUnit(name string, mode string, properties ...Property) (string, error) {

+	return c.runJob("org.freedesktop.systemd1.Manager.StartTransientUnit", name, mode, properties, make([]PropertyCollection, 0))

+}

+

+// KillUnit takes the unit name and a UNIX signal number to send.  All of the unit's

+// processes are killed.

+func (c *Conn) KillUnit(name string, signal int32) {

+	c.sysobj.Call("org.freedesktop.systemd1.Manager.KillUnit", 0, name, "all", signal).Store()

+}

+

+// getProperties takes the unit name and returns all of its dbus object properties, for the given dbus interface

+func (c *Conn) getProperties(unit string, dbusInterface string) (map[string]interface{}, error) {

+	var err error

+	var props map[string]dbus.Variant

+

+	path := ObjectPath("/org/freedesktop/systemd1/unit/" + unit)

+	if !path.IsValid() {

+		return nil, errors.New("invalid unit name: " + unit)