From b4f10a5e8956d26f0bc6b9aef12846b57caee08b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 8 Jul 2010 21:34:51 +0200
Subject: install: various improvements

Rename --start to --realize, to make things less confusing when doing
"systemctl stop --realize foo.service".

Introduce --realize=reload.

Don't talk to systemd when run within a chroot, or when systemd isn't
running.
---
 man/daemon.xml          |  4 ++--
 man/systemd-install.xml | 32 ++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'man')

diff --git a/man/daemon.xml b/man/daemon.xml
index dfee390164..b708bdcfba 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -793,11 +793,11 @@ endif</programlisting>
                         package managers:</para>
 
                         <programlisting>%post
-/usr/bin/systemd-install --start enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
+/usr/bin/systemd-install --realize enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 
 %preun
 if [ "$1" -eq 0 ]; then
-        /usr/bin/systemd-install --start disable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
+        /usr/bin/systemd-install --realize disable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 fi</programlisting>
 
                 </refsect2>
diff --git a/man/systemd-install.xml b/man/systemd-install.xml
index c3ec4bdcd8..28415d19e1 100644
--- a/man/systemd-install.xml
+++ b/man/systemd-install.xml
@@ -130,13 +130,14 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--start[=MODE]</option></term>
+                                <term><option>--realize[=MODE]</option></term>
 
                                 <listitem><para>After
-                                enabling/disabling stop/restart the
-                                unit and reload manager
+                                enabling/disabling stop/restart/stop
+                                the unit and reload manager
                                 configuration. Optionally, takes one
                                 of <option>no</option>,
+                                <option>reload</option>,
                                 <option>minimal</option>,
                                 <option>maybe</option> or
                                 <option>yes</option>. If
@@ -145,13 +146,17 @@
                                 configuration and no service will be
                                 started or stopped after
                                 enabling/disabling of the unit
-                                files. If <option>minimal</option> is
-                                passed and a unit is being enabled it
-                                will also be restarted should it
-                                already be running. If a unit is being
-                                disabled it will be stopped should it
-                                be running. In either case the
-                                daemon configuration is
+                                files. If <option>reload</option> is
+                                passed the daemon configuration is
+                                reloaded but the unit otherwise not
+                                started/stopped/restarted. If
+                                <option>minimal</option> is passed and
+                                a unit is being enabled it will also
+                                be restarted should it already be
+                                running. If a unit is being disabled
+                                it will be stopped should it be
+                                running. In either case the daemon
+                                configuration is
                                 reloaded. <option>maybe</option> is
                                 similar to this, but the unit will
                                 also be started if it is being enabled
@@ -168,8 +173,11 @@
                                 <option>maybe</option>. This option
                                 has no effect when
                                 <option>--global</option> or
-                                <command>test</command> is
-                                used.</para></listitem>
+                                <command>test</command> is used, or
+                                when systemd is not running or the
+                                command is executed in a
+                                <citerefentry><refentrytitle>chroot</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+                                environment.</para></listitem>
                         </varlistentry>
                 </variablelist>
 
-- 
cgit v1.2.3-54-g00ecf