[systemd-commits] 2 commits - man/systemd-gpt-auto-generator.xml src/core

[Lennart Poettering]

 man/systemd-gpt-auto-generator.xml |   14 ++++++++------
 src/core/busname.c                 |    2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit fb255b31c5f4eca821d60a2c9b1235a513f15732
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 7 18:50:13 2014 +0100

    man: reference the Discoverable Partitions Spec from the gpt-auto-generator man page

diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index a753fb0..ac9a62d 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -61,10 +61,12 @@
                 <filename>/home</filename>, <filename>/srv</filename>
                 and swap partitions and creates mount and swap units
                 for them, based on the the partition type GUIDs of
-                GUID partition tables (GPT). Note that this generator
-                has no effect on non-GPT systems, on systems where the
-                units are explicitly configured (for example, listed
-                in
+                GUID partition tables (GPT). It implements the <ulink
+                url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable
+                Partitions Specification</ulink>. Note that this
+                generator has no effect on non-GPT systems, on systems
+                where the units are explicitly configured (for
+                example, listed in
                 <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>),
                 or where the mount points are non-empty.</para>
 
@@ -152,8 +154,8 @@
 
                 <para><filename>systemd-gpt-auto-generator</filename>
                 implements the <ulink
-                url="http://www.freedesktop.org/wiki/Software/systemd/Generators">generator
-                specification</ulink>.</para>
+                url="http://www.freedesktop.org/wiki/Software/systemd/Generators">Generator
+                Specification</ulink>.</para>
         </refsect1>
 
         <refsect1>

commit 700ff4d97311902a440109a2c081731ab6ae8a20
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 7 17:29:16 2014 +0100

    busname: don't drop 'service' from the result string

diff --git a/src/core/busname.c b/src/core/busname.c
index 237011a..bca2145 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -548,7 +548,7 @@ DEFINE_STRING_TABLE_LOOKUP(busname_state, BusNameState);
 static const char* const busname_result_table[_BUSNAME_RESULT_MAX] = {
         [BUSNAME_SUCCESS] = "success",
         [BUSNAME_FAILURE_RESOURCES] = "resources",
-        [BUSNAME_FAILURE_SERVICE_FAILED_PERMANENT] = "failed-permanent",
+        [BUSNAME_FAILURE_SERVICE_FAILED_PERMANENT] = "service-failed-permanent",
 };
 
 DEFINE_STRING_TABLE_LOOKUP(busname_result, BusNameResult);