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

[Michal Schmidt]

 src/core/load-fragment-gperf.gperf.m4 |    2 +-
 src/systemctl/systemctl.c             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a8c867fecec55998b7a78470aebdede2db0673e
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Jul 8 17:17:14 2014 +0200

    load-fragment: ConditionFirstBoot wants a bool string, not a path

diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
index 4c092d7..d70f9ee 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -162,7 +162,7 @@ Unit.ConditionDirectoryNotEmpty, config_parse_unit_condition_path,   CONDITION_D
 Unit.ConditionFileNotEmpty,      config_parse_unit_condition_path,   CONDITION_FILE_NOT_EMPTY,      0
 Unit.ConditionFileIsExecutable,  config_parse_unit_condition_path,   CONDITION_FILE_IS_EXECUTABLE,  0
 Unit.ConditionNeedsUpdate,       config_parse_unit_condition_path,   CONDITION_NEEDS_UPDATE,        0
-Unit.ConditionFirstBoot,         config_parse_unit_condition_path,   CONDITION_FIRST_BOOT,          0
+Unit.ConditionFirstBoot,         config_parse_unit_condition_string, CONDITION_FIRST_BOOT,          0
 Unit.ConditionKernelCommandLine, config_parse_unit_condition_string, CONDITION_KERNEL_COMMAND_LINE, 0
 Unit.ConditionArchitecture,      config_parse_unit_condition_string, CONDITION_ARCHITECTURE,        0
 Unit.ConditionVirtualization,    config_parse_unit_condition_string, CONDITION_VIRTUALIZATION,      0

commit b7bbdabeb4a5b66fdbcdfed0d097109cfb39c43e
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Jul 8 15:17:36 2014 +0200

    systemctl: fix visual alignment for lines prefixed with color dots

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 1ab4794..96a0d05 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -456,7 +456,7 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
                 }
 
                 if (circle_len > 0)
-                        printf("%s%s%s", on_circle, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : "  ", off_circle);
+                        printf("%s%s%s ", on_circle, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : " ", off_circle);
 
                 printf("%s%-*s%s %s%-*s%s %s%-*s %-*s%s %-*s",
                        on_active, id_len, id, off_active,