summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-09-18 11:53:47 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-18 11:53:47 +0200
commit6569cae18ed640a4e9f52f73e2a3ec54b07d0406 (patch)
tree0bc12adb46c039106afaf109a16983ce372ddbf4
parent3ef63c317481c2b3f1fe39e1b0f130aac3544522 (diff)
unit-printf: add specifiers for the host name, machine id, boot id
-rw-r--r--TODO2
-rw-r--r--man/systemd.unit.xml15
-rw-r--r--src/core/unit-printf.c49
3 files changed, 64 insertions, 2 deletions
diff --git a/TODO b/TODO
index 2a3cc77bec..f7da51c6ed 100644
--- a/TODO
+++ b/TODO
@@ -62,8 +62,6 @@ Features:
* journald: add kernel cmdline option to disable ratelimiting for debug purposes
-* Add a way to reference the machine/boot ID from ExecStart= and similar command lines
-
* move PID 1 segfaults to /var/lib/systemd/coredump?
* Document word splitting syntax for ExecStart= and friends
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index e0aadf4cd3..55569681cf 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -273,6 +273,21 @@
<entry>User shell</entry>
<entry>This is the shell of the configured user of the unit, or (if none is set) the user running the systemd instance.</entry>
</row>
+ <row>
+ <entry><literal>%m</literal></entry>
+ <entry>Machine ID</entry>
+ <entry>The machine ID of the running system, formatted as string. See <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry> for more information.</entry>
+ </row>
+ <row>
+ <entry><literal>%b</literal></entry>
+ <entry>Boot ID</entry>
+ <entry>The boot ID of the running system, formatted as string. See <citerefentry><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry> for more information.</entry>
+ </row>
+ <row>
+ <entry><literal>%H</literal></entry>
+ <entry>Host name</entry>
+ <entry>The host name of the running system.</entry>
+ </row>
</tbody>
</tgroup>
</table>
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index 35da29abdf..308bbd6351 100644
--- a/src/core/unit-printf.c
+++ b/src/core/unit-printf.c
@@ -124,6 +124,8 @@ static char *specifier_user_name(char specifier, void *data, void *userdata) {
int r;
const char *username;
+ assert(u);
+
c = unit_get_exec_context(u);
if (!c)
return NULL;
@@ -147,6 +149,8 @@ static char *specifier_user_home(char specifier, void *data, void *userdata) {
int r;
const char *username, *home;
+ assert(u);
+
c = unit_get_exec_context(u);
if (!c)
return NULL;
@@ -176,6 +180,8 @@ static char *specifier_user_shell(char specifier, void *data, void *userdata) {
int r;
const char *username, *shell;
+ assert(u);
+
c = unit_get_exec_context(u);
if (!c)
return NULL;
@@ -199,6 +205,42 @@ static char *specifier_user_shell(char specifier, void *data, void *userdata) {
return strdup(shell);
}
+static char *specifier_machine_id(char specifier, void *data, void *userdata) {
+ sd_id128_t id;
+ char *buf;
+ int r;
+
+ r = sd_id128_get_machine(&id);
+ if (r < 0)
+ return NULL;
+
+ buf = new(char, 33);
+ if (!buf)
+ return NULL;
+
+ return sd_id128_to_string(id, buf);
+}
+
+static char *specifier_boot_id(char specifier, void *data, void *userdata) {
+ sd_id128_t id;
+ char *buf;
+ int r;
+
+ r = sd_id128_get_boot(&id);
+ if (r < 0)
+ return NULL;
+
+ buf = new(char, 33);
+ if (!buf)
+ return NULL;
+
+ return sd_id128_to_string(id, buf);
+}
+
+static char *specifier_host_name(char specifier, void *data, void *userdata) {
+ return gethostname_malloc();
+}
+
char *unit_name_printf(Unit *u, const char* format) {
/*
@@ -238,6 +280,9 @@ char *unit_full_printf(Unit *u, const char *format) {
* %u the username of the configured user or running user
* %h the homedir of the configured user or running user
* %s the shell of the configured user or running user
+ * %m the machine ID of the running system
+ * %b the boot ID of the running system
+ * %H the host name of the running system
*/
const Specifier table[] = {
@@ -256,6 +301,10 @@ char *unit_full_printf(Unit *u, const char *format) {
{ 'u', specifier_user_name, NULL },
{ 'h', specifier_user_home, NULL },
{ 's', specifier_user_shell, NULL },
+
+ { 'm', specifier_machine_id, NULL },
+ { 'H', specifier_host_name, NULL },
+ { 'b', specifier_boot_id, NULL },
{ 0, NULL, NULL }
};