mirror of
https://github.com/clearlinux/systemd-stable.git
synced 2026-11-20 13:08:40 +00:00
nspawn: properly format container_uuid in UUID format
http://lists.freedesktop.org/archives/systemd-devel/2014-April/018971.html
(cherry picked from commit 9f24adc288)
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
430015550f
commit
e003612775
+13
-5
@@ -741,6 +741,15 @@ static int setup_resolv_conf(const char *dest) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static char* id128_format_as_uuid(sd_id128_t id, char s[37]) {
|
||||
|
||||
snprintf(s, 37,
|
||||
"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
|
||||
SD_ID128_FORMAT_VAL(id));
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
static int setup_boot_id(const char *dest) {
|
||||
_cleanup_free_ char *from = NULL, *to = NULL;
|
||||
sd_id128_t rnd = {};
|
||||
@@ -766,10 +775,7 @@ static int setup_boot_id(const char *dest) {
|
||||
return r;
|
||||
}
|
||||
|
||||
snprintf(as_uuid, sizeof(as_uuid),
|
||||
"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
|
||||
SD_ID128_FORMAT_VAL(rnd));
|
||||
char_array_0(as_uuid);
|
||||
id128_format_as_uuid(rnd, as_uuid);
|
||||
|
||||
r = write_string_file(from, as_uuid);
|
||||
if (r < 0) {
|
||||
@@ -2038,7 +2044,9 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
if (!sd_id128_equal(arg_uuid, SD_ID128_NULL)) {
|
||||
if (asprintf((char**)(envp + n_env++), "container_uuid=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(arg_uuid)) < 0) {
|
||||
char as_uuid[37];
|
||||
|
||||
if (asprintf((char**)(envp + n_env++), "container_uuid=%s", id128_format_as_uuid(arg_uuid, as_uuid)) < 0) {
|
||||
log_oom();
|
||||
goto child_fail;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user