anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0097-man-units-fix-installation-of-systemd-nspawn-.servic.patch

572a44
From a3794196f13a2fd47d61517a304c15e162a6c06a Mon Sep 17 00:00:00 2001
572a44
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
572a44
Date: Thu, 7 Nov 2013 23:57:19 -0500
572a44
Subject: [PATCH] man,units: fix installation of systemd-nspawn@.service and
572a44
 add example
572a44
572a44
---
572a44
 TODO                             |  1 +
572a44
 man/systemd-nspawn.xml           | 12 ++++++++++++
572a44
 units/systemd-nspawn@.service.in |  2 +-
572a44
 3 files changed, 14 insertions(+), 1 deletion(-)
572a44
572a44
diff --git a/TODO b/TODO
572a44
index 07269f4..ad4b733 100644
572a44
--- a/TODO
572a44
+++ b/TODO
572a44
@@ -493,6 +493,7 @@ Features:
572a44
   - nspawn: maybe add a way to drop additional caps, in addition to add additional caps
572a44
   - nspawn: maybe explicitly reset loginuid?
572a44
   - nspawn: make it work for dwalsh and shared /usr containers -- tmpfs mounts as command line parameters, selinux exec context
572a44
+  - refuses to boot containers without /etc/machine-id (OK?), and with empty /etc/machine-id (not OK).
572a44
 
572a44
 * cryptsetup:
572a44
   - cryptsetup-generator: allow specification of passwords in crypttab itself
572a44
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
572a44
index 7d450f9..ba9e516 100644
572a44
--- a/man/systemd-nspawn.xml
572a44
+++ b/man/systemd-nspawn.xml
572a44
@@ -428,6 +428,18 @@
572a44
         </refsect1>
572a44
 
572a44
         <refsect1>
572a44
+                <title>Example 4</title>
572a44
+
572a44
+                <programlisting># mv ~/arch-tree /var/lib/container/arch
572a44
+# systemctl enable systemd-nspawn@arch.service
572a44
+# systemctl start systemd-nspawn@arch.service</programlisting>
572a44
+
572a44
+                <para>This makes the Arch Linux container part of the
572a44
+                <filename>multi-user.target</filename> on the host.
572a44
+                </para>
572a44
+        </refsect1>
572a44
+
572a44
+        <refsect1>
572a44
                 <title>Exit status</title>
572a44
 
572a44
                 <para>The exit code of the program executed in the
572a44
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
572a44
index eca62e3..8e00736 100644
572a44
--- a/units/systemd-nspawn@.service.in
572a44
+++ b/units/systemd-nspawn@.service.in
572a44
@@ -14,4 +14,4 @@ ExecStart=@bindir@/systemd-nspawn -bjD /var/lib/container/%i
572a44
 Type=notify
572a44
 
572a44
 [Install]
572a44
-Also=multi-user.target
572a44
+WantedBy=multi-user.target