Merge pull request #1562 from mheon/update_install_instructions

Update docs to build a runc that works with systemd

3 files changed, 5 insertions, 5 deletions

diff --git a/docs/tutorials/podman_tutorial.md b/docs/tutorials/podman_tutorial.md
index 9a6cf3e9d..a866b8eed 100644
--- a/docs/tutorials/podman_tutorial.md
+++ b/docs/tutorials/podman_tutorial.md
@@ -85,7 +85,7 @@ $ sudo cp bin/* /usr/libexec/cni
 ```console
 $ git clone https://github.com/opencontainers/runc.git $GOPATH/src/github.com/opencontainers/runc
 $ cd $GOPATH/src/github.com/opencontainers/runc
-$ make static BUILDTAGS="seccomp selinux"
+$ make BUILDTAGS="seccomp"
 $ sudo cp runc /usr/bin/runc
 ```
 
diff --git a/install.md b/install.md
index a6b912a87..33224c810 100644
--- a/install.md
+++ b/install.md
@@ -72,7 +72,7 @@ apt-get install -y \
 
 Debian, Ubuntu, and related distributions will also need to do the following setup:
 
- * A copy of the development libraries for `ostree`, either in the form of the `libostree-dev` package from the [flatpak](https://launchpad.net/~alexlarsson/+archive/ubuntu/flatpak) PPA, or built [from source](https://github.com/ostreedev/ostree) (more on that [here](https://ostree.readthedocs.io/en/latest/#building)).
+ * A copy of the development libraries for `ostree`, either in the form of the `libostree-dev` package from the [flatpak](https://launchpad.net/~alexlarsson/+archive/ubuntu/flatpak) PPA, or built [from source](https://github.com/ostreedev/ostree) (more on that [here](https://ostree.readthedocs.io/en/latest/#building)). As of Ubuntu 18.04, `libostree-dev` is available in the main repositories, and the PPA is no longer required.
  * [Add required configuration files](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#adding-required-configuration-files)
  * Install conmon, CNI plugins and runc
    * [Install conmon](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#building-and-installing-conmon)
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 0642c5aad..d909c5d17 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -927,7 +927,7 @@ func (c *Container) makeBindMounts() error {
 		return errors.Wrapf(err, "error creating resolv.conf for container %s", c.ID())
 	}
 	if err = label.Relabel(newResolv, c.config.MountLabel, false); err != nil {
-		return errors.Wrapf(err, "error relabeling %q for container %q", newResolv, c.ID)
+		return errors.Wrapf(err, "error relabeling %q for container %q", newResolv, c.ID())
 	}
 	c.state.BindMounts["/etc/resolv.conf"] = newResolv
 
@@ -941,7 +941,7 @@ func (c *Container) makeBindMounts() error {
 		return errors.Wrapf(err, "error creating hosts file for container %s", c.ID())
 	}
 	if err = label.Relabel(newHosts, c.config.MountLabel, false); err != nil {
-		return errors.Wrapf(err, "error relabeling %q for container %q", newHosts, c.ID)
+		return errors.Wrapf(err, "error relabeling %q for container %q", newHosts, c.ID())
 	}
 	c.state.BindMounts["/etc/hosts"] = newHosts
 
@@ -953,7 +953,7 @@ func (c *Container) makeBindMounts() error {
 			return errors.Wrapf(err, "error creating hostname file for container %s", c.ID())
 		}
 		if err = label.Relabel(hostnamePath, c.config.MountLabel, false); err != nil {
-			return errors.Wrapf(err, "error relabeling %q for container %q", hostnamePath, c.ID)
+			return errors.Wrapf(err, "error relabeling %q for container %q", hostnamePath, c.ID())
 		}
 		c.state.BindMounts["/etc/hostname"] = hostnamePath
 	}