build fix for opensuse

[elogind.git] / systemctl.vala

diff --git a/systemctl.vala b/systemctl.vala
index 6c01ad1263bd14ece5e17ef39a2ab0b30f53d721..388ab7d505a7eaefac77e87de9b73cca42b808e5 100644 (file)
--- a/systemctl.vala
+++ b/systemctl.vala
@@ -70,7 +70,7 @@ static const OptionEntry entries[] = {
 
 int main (string[] args) {
 
-        OptionContext context = new OptionContext("[OPTION...] [COMMAND [ARGUMENT...]]");
+        OptionContext context = new OptionContext("[COMMAND [ARGUMENT...]]");
         context.add_main_entries(entries, null);
         context.set_description(
                         "Commands:\n" +
@@ -81,9 +81,14 @@ int main (string[] args) {
                         "  cancel [JOB...]     Cancel one or more jobs\n" +
                         "  start [NAME...]     Start on or more units\n" +
                         "  stop [NAME...]      Stop on or more units\n" +
+                        "  enter [NAME]        Start one unit and stop all others\n" +
                         "  restart [NAME...]   Restart on or more units\n" +
                         "  reload [NAME...]    Reload on or more units\n" +
-                        "  monitor             Monitor unit/job changes\n");
+                        "  monitor             Monitor unit/job changes\n" +
+                        "  dump                Dump server status\n" +
+                        "  snapshot [NAME]     Create a snapshot\n" +
+                        "  daemon-reload       Reload daemon configuration\n" +
+                        "  daemon-reexecute    Reexecute daemon\n");
 
         try {
                 context.parse(ref args);
@@ -97,14 +102,14 @@ int main (string[] args) {
                 Manager manager = bus.get_object (
                                 "org.freedesktop.systemd1",
                                 "/org/freedesktop/systemd1",
-                                "org.freedesktop.systemd1") as Manager;
+                                "org.freedesktop.systemd1.Manager") as Manager;
 
                 if (args[1] == "list-units" || args.length <= 1) {
                         var list = manager.list_units();
                         uint n = 0;
                         Posix.qsort(list, list.length, sizeof(Manager.UnitInfo), unit_info_compare);
 
-                        stdout.printf("%-45s %-6s %-12s %-17s\n", "UNIT", "LOAD", "ACTIVE", "JOB");
+                        stdout.printf("%-45s %-6s %-12s %-12s %-17s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB");
 
                         foreach (var i in list) {
 
@@ -114,10 +119,10 @@ int main (string[] args) {
                                 if (!all && i.active_state == "inactive")
                                         continue;
 
-                                stdout.printf("%-45s %-6s %-12s", i.id, i.load_state, i.active_state);
+                                stdout.printf("%-45s %-6s %-12s %-12s", i.id, i.load_state, i.active_state, i.sub_state);
 
                                 if (i.job_id != 0)
-                                        stdout.printf(" → %-15s", i.job_type);
+                                        stdout.printf(" -> %-15s", i.job_type);
 
                                 stdout.puts("\n");
                                 n++;
@@ -191,7 +196,7 @@ int main (string[] args) {
 
                         for (int i = 2; i < args.length; i++) {
 
-                                ObjectPath p = manager.get_unit(args[i]);
+                                ObjectPath p = manager.load_unit(args[i]);
 
                                 Unit u = bus.get_object(
                                                 "org.freedesktop.systemd1",
@@ -210,6 +215,22 @@ int main (string[] args) {
                                         u.reload(mode);
                         }
 
+                } else if (args[1] == "isolate") {
+
+                        if (args.length != 3) {
+                                stderr.printf("Missing argument.\n");
+                                return 1;
+                        }
+
+                        ObjectPath p = manager.load_unit(args[2]);
+
+                        Unit u = bus.get_object(
+                                        "org.freedesktop.systemd1",
+                                        p,
+                                        "org.freedesktop.systemd1.Unit") as Unit;
+
+                        u.start("isolate");
+
                 } else if (args[1] == "monitor") {
 
                         manager.subscribe();
@@ -224,6 +245,22 @@ int main (string[] args) {
 
                 } else if (args[1] == "dump")
                         stdout.puts(manager.dump());
+                else if (args[1] == "snapshot") {
+
+                        ObjectPath p = manager.create_snapshot(args.length > 2 ? args[2] : "");
+
+                        Unit u = bus.get_object(
+                                        "org.freedesktop.systemd1",
+                                        p,
+                                        "org.freedesktop.systemd1.Unit") as Unit;
+
+                        stdout.printf("%s\n", u.id);
+                } else if (args[1] == "daemon-reload")
+                        manager.reload();
+                else if (args[1] == "daemon-reexecute" || args[1] == "daemon-reexec")
+                        manager.reexecute();
+                else if (args[1] == "daemon-exit")
+                        manager.exit();
                 else {
                         stderr.printf("Unknown command %s.\n", args[1]);
                         return 1;