[systemd-commits] 2 commits - src/cgls src/core src/login src/systemctl

[Zbigniew Jędrzejewski-Szmek]

 src/cgls/cgls.c           |    2 +-
 src/core/dbus-socket.c    |    2 +-
 src/login/loginctl.c      |   12 ++++++------
 src/systemctl/systemctl.c |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c25b1ee6cd6d956a834ba50568436b3349320d43
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Jun 19 18:09:54 2013 -0400

    core/dbus: properly export cgroup properties on sockets
    
    https://bugs.freedesktop.org/show_bug.cgi?id=65945

diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index 77d98ea..973f905 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -205,7 +205,7 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes
                 { "org.freedesktop.systemd1.Socket", bus_socket_properties,       s },
                 { "org.freedesktop.systemd1.Socket", bus_exec_context_properties, &s->exec_context },
                 { "org.freedesktop.systemd1.Socket", bus_kill_context_properties, &s->kill_context },
-                { "org.freedesktop.systemd1.Socket", bus_unit_properties,         u },
+                { "org.freedesktop.systemd1.Socket", bus_unit_cgroup_properties,  u },
                 { NULL, }
         };
 

commit 422fa6500a44a222b655cd218a658f8a4f34a768
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Jun 19 18:08:14 2013 -0400

    cgls,loginctl,systemctl: fix -l
    
    Fixup for 98a6e13 "journalctl,loginctl,systemctl,systemd-cgls: add -l
    as alias for --full".

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index f232731..155c5cc 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -77,7 +77,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 1);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hkaM:", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hkalM:", options, NULL)) >= 0) {
 
                 switch (c) {
 
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 087e52d..1b9723f 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1346,13 +1346,13 @@ static int parse_argv(int argc, char *argv[]) {
                 { "version",         no_argument,       NULL, ARG_VERSION         },
                 { "property",        required_argument, NULL, 'p'                 },
                 { "all",             no_argument,       NULL, 'a'                 },
+                { "full",            no_argument,       NULL, 'l'                 },
                 { "no-pager",        no_argument,       NULL, ARG_NO_PAGER        },
                 { "kill-who",        required_argument, NULL, ARG_KILL_WHO        },
                 { "signal",          required_argument, NULL, 's'                 },
                 { "host",            required_argument, NULL, 'H'                 },
                 { "privileged",      no_argument,       NULL, 'P'                 },
                 { "no-ask-password", no_argument,       NULL, ARG_NO_ASK_PASSWORD },
-                { "full",            no_argument,       NULL, 'l'                 },
                 { NULL,              0,                 NULL, 0                   }
         };
 
@@ -1361,7 +1361,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hp:as:H:P", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hp:als:H:P", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -1395,6 +1395,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_all = true;
                         break;
 
+                case 'l':
+                        arg_full = true;
+                        break;
+
                 case ARG_NO_PAGER:
                         arg_no_pager = true;
                         break;
@@ -1424,10 +1428,6 @@ static int parse_argv(int argc, char *argv[]) {
                         parse_user_at_host(optarg, &arg_user, &arg_host);
                         break;
 
-                case 'l':
-                        arg_full = true;
-                        break;
-
                 case '?':
                         return -EINVAL;
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 8d496ab..53033ba 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4872,7 +4872,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "ht:p:aqfs:H:Pn:o:i", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "ht:p:alqfs:H:Pn:o:i", options, NULL)) >= 0) {
 
                 switch (c) {