[systemd-commits] 2 commits - man/systemd.unit.xml src/fstab-generator
Zbigniew JÄdrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Wed Aug 14 19:38:28 PDT 2013
man/systemd.unit.xml | 10 +++++++++-
src/fstab-generator/fstab-generator.c | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 693093c6db9d8510729b7566e74182b4ff50e31c
Author: Michael Stapelberg <stapelberg at debian.org>
Date: Mon Aug 12 21:59:41 2013 +0200
systemd.unit(5): clarify the Description= contents
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index c6325d3..1714157 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -359,7 +359,15 @@
describing the unit. This is intended
for use in UIs to show descriptive
information along with the unit
- name.</para></listitem>
+ name. The description should contain a name
+ that means something to the end user.
+ <literal>Apache2 Web Server</literal> is a good
+ example. Bad examples are
+ <literal>high-performance light-weight HTTP
+ server</literal> (too generic) or
+ <literal>Apache2</literal> (too specific and
+ meaningless for people who do not know
+ Apache).</para></listitem>
</varlistentry>
<varlistentry>
commit 01264ad1cc27ecaa059857429ed1b4f3994b26c3
Author: WANG Chao <chaowang at redhat.com>
Date: Tue Aug 13 16:38:19 2013 +0800
fstab-generator: log_oom() if automount_name is null
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 5a2074e..2a779bb 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -351,7 +351,7 @@ static int add_mount(
if (automount && !path_equal(where, "/")) {
automount_name = unit_name_from_path(where, ".automount");
- if (!name)
+ if (!automount_name)
return log_oom();
automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
More information about the systemd-commits
mailing list