From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 26 Jul 2013 15:05:43 +0000 (+0200)
Subject: systemctl: remove "load" command
X-Git-Tag: v207~237
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=223ab9345d70e2ea8498b96ff07ee73c25ad18b4

systemctl: remove "load" command

"systemctl load" has always been racy since the GC could hit any time,
before making use of the loaded unit. Very recent systemd will run GC
immeidately after all unit state changes which has the effect that the
the effect of "systemctl load" is completely gone now, so let's remove
the support for it in "systemctl" for good.
---

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 45955da17..2a23655cf 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -942,28 +942,6 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><command>load <replaceable>NAME</replaceable>...</command></term>
-
-        <listitem>
-          <para>Load one or more units specified on the command
-          line. This will simply load their configuration from disk,
-          but not start them. To start them, you need to use the
-          <command>start</command> command which will implicitly load
-          a unit that has not been loaded yet. Note that systemd
-          garbage collects loaded units that are not active or
-          referenced by an active unit. This means that units loaded
-          this way will usually not stay loaded for long. Also note
-          that this command cannot be used to reload unit
-          configuration. Use the <command>daemon-reload</command>
-          command for that. All in all, this command is of little use
-          except for debugging.</para>
-
-          <para>This command should not be confused with the
-          <command>daemon-reload</command> or
-          <command>reload</command>.</para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><command>list-jobs</command></term>
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 08981a800..60dee5dc6 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1388,36 +1388,6 @@ static int list_jobs(DBusConnection *bus, char **args) {
         return 0;
 }
 
-static int load_unit(DBusConnection *bus, char **args) {
-        char **name;
-
-        assert(args);
-
-        STRV_FOREACH(name, args+1) {
-                _cleanup_free_ char *n = NULL;
-                int r;
-
-                n = unit_name_mangle(*name);
-                if (!n)
-                        return log_oom();
-
-                r = bus_method_call_with_reply(
-                                bus,
-                                "org.freedesktop.systemd1",
-                                "/org/freedesktop/systemd1",
-                                "org.freedesktop.systemd1.Manager",
-                                "LoadUnit",
-                                NULL,
-                                NULL,
-                                DBUS_TYPE_STRING, &n,
-                                DBUS_TYPE_INVALID);
-                if (r < 0)
-                        return r;
-        }
-
-        return 0;
-}
-
 static int cancel_job(DBusConnection *bus, char **args) {
         char **name;
 
@@ -4687,7 +4657,6 @@ static int systemctl_help(void) {
                "  help [NAME...|PID...]           Show manual for one or more units\n"
                "  reset-failed [NAME...]          Reset failed state for all, one, or more\n"
                "                                  units\n"
-               "  load [NAME...]                  Load one or more units\n"
                "  list-dependencies [NAME]        Recursively show units which are required\n"
                "                                  or wanted by this unit or by which this\n"
                "                                  unit is required or wanted\n\n"