X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmachine-id-setup.c;h=efb074fcbda14d9ce8d78b084ee4f082196ea58d;hb=671174136525ddf208cdbe75d6d6bd159afa961f;hp=fbba3aab78d0f0073a65b34d7374cb8a8c7f24c0;hpb=5c0d398dfc4d79df2209515d28cafd9dc129838e;p=elogind.git diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index fbba3aab7..efb074fcb 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -27,7 +27,7 @@ #include #include -#include +#include "systemd/sd-id128.h" #include "machine-id-setup.h" #include "macro.h" @@ -36,8 +36,9 @@ #include "log.h" #include "virt.h" #include "fileio.h" +#include "path-util.h" -static int shorten_uuid(char destination[36], const char *source) { +static int shorten_uuid(char destination[34], const char source[36]) { unsigned i, j; for (i = 0, j = 0; i < 36 && j < 32; i++) { @@ -59,74 +60,82 @@ static int shorten_uuid(char destination[36], const char *source) { return -EINVAL; } -static int generate(char id[34]) { +static int generate(char id[34], const char *root) { int fd, r; unsigned char *p; sd_id128_t buf; - char *q; + char *q; ssize_t k; - const char *vm_id; + const char *vm_id, *dbus_machine_id; assert(id); + if (isempty(root)) + dbus_machine_id = "/var/lib/dbus/machine-id"; + else + dbus_machine_id = strappenda(root, "/var/lib/dbus/machine-id"); + /* First, try reading the D-Bus machine id, unless it is a symlink */ - fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); + fd = open(dbus_machine_id, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); if (fd >= 0) { + k = loop_read(fd, id, 33, false); + safe_close(fd); - k = loop_read(fd, id, 32, false); - close_nointr_nofail(fd); - - if (k >= 32) { - id[32] = '\n'; - id[33] = 0; - - log_info("Initializing machine ID from D-Bus machine ID."); - return 0; - } - } - - /* If that didn't work, see if we are running in qemu/kvm and a - * machine ID was passed in via -uuid on the qemu/kvm command - * line */ + if (k == 33 && id[32] == '\n') { - r = detect_vm(&vm_id); - if (r > 0 && streq(vm_id, "kvm")) { - char uuid[37]; + id[32] = 0; + if (id128_is_valid(id)) { + id[32] = '\n'; + id[33] = 0; - fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); - if (fd >= 0) { - k = loop_read(fd, uuid, 36, false); - close_nointr_nofail(fd); - - if (k >= 36) { - r = shorten_uuid(id, uuid); - if (r >= 0) { - log_info("Initializing machine ID from KVM UUID."); - return 0; - } + log_info("Initializing machine ID from D-Bus machine ID."); + return 0; } } } - /* If that didn't work either, see if we are running in a - * container, and a machine ID was passed in via - * $container_uuid the way libvirt/LXC does it */ - r = detect_container(NULL); - if (r > 0) { - char *e; - - r = getenv_for_pid(1, "container_uuid", &e); + if (isempty(root)) { + /* If that didn't work, see if we are running in a container, + * and a machine ID was passed in via $container_uuid the way + * libvirt/LXC does it */ + r = detect_container(NULL); if (r > 0) { - if (strlen(e) >= 36) { - r = shorten_uuid(id, e); - if (r >= 0) { - log_info("Initializing machine ID from container UUID."); - free(e); - return 0; + _cleanup_free_ char *e = NULL; + + r = getenv_for_pid(1, "container_uuid", &e); + if (r > 0) { + if (strlen(e) >= 36) { + r = shorten_uuid(id, e); + if (r >= 0) { + log_info("Initializing machine ID from container UUID."); + return 0; + } } } - free(e); + } else { + /* If we are not running in a container, see if we are + * running in qemu/kvm and a machine ID was passed in + * via -uuid on the qemu/kvm command line */ + + r = detect_vm(&vm_id); + if (r > 0 && streq(vm_id, "kvm")) { + char uuid[37]; + + fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); + if (fd >= 0) { + k = loop_read(fd, uuid, 36, false); + safe_close(fd); + + if (k >= 36) { + r = shorten_uuid(id, uuid); + if (r >= 0) { + log_info("Initializing machine ID from KVM UUID."); + return 0; + } + } + } + } } } @@ -150,11 +159,24 @@ static int generate(char id[34]) { return 0; } -int machine_id_setup(void) { - int fd, r; - bool writable; +int machine_id_setup(const char *root) { + const char *etc_machine_id, *run_machine_id; + _cleanup_close_ int fd = -1; + bool writable = false; struct stat st; char id[34]; /* 32 + \n + \0 */ + int r; + + if (isempty(root)) { + etc_machine_id = "/etc/machine-id"; + run_machine_id = "/run/machine-id"; + } else { + etc_machine_id = strappenda(root, "/etc/machine-id"); + path_kill_slashes((char*) etc_machine_id); + + run_machine_id = strappenda(root, "/run/machine-id"); + path_kill_slashes((char*) run_machine_id); + } RUN_WITH_UMASK(0000) { /* We create this 0444, to indicate that this isn't really @@ -162,13 +184,14 @@ int machine_id_setup(void) { * will be owned by root it doesn't matter much, but maybe * people look. */ - fd = open("/etc/machine-id", O_RDWR|O_CREAT|O_CLOEXEC|O_NOCTTY, 0444); + mkdir_parents(etc_machine_id, 0755); + fd = open(etc_machine_id, O_RDWR|O_CREAT|O_CLOEXEC|O_NOCTTY, 0444); if (fd >= 0) writable = true; else { - fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); + fd = open(etc_machine_id, O_RDONLY|O_CLOEXEC|O_NOCTTY); if (fd < 0) { - log_error("Cannot open /etc/machine-id: %m"); + log_error("Cannot open %s: %m", etc_machine_id); return -errno; } @@ -178,67 +201,58 @@ int machine_id_setup(void) { if (fstat(fd, &st) < 0) { log_error("fstat() failed: %m"); - r = -errno; - goto finish; + return -errno; } - if (S_ISREG(st.st_mode)) { - if (loop_read(fd, id, 32, false) >= 32) { - r = 0; - goto finish; + if (S_ISREG(st.st_mode)) + if (loop_read(fd, id, 33, false) == 33 && id[32] == '\n') { + id[32] = 0; + + if (id128_is_valid(id)) + return 0; } - } /* Hmm, so, the id currently stored is not useful, then let's * generate one */ - r = generate(id); + r = generate(id, root); if (r < 0) - goto finish; + return r; if (S_ISREG(st.st_mode) && writable) { lseek(fd, 0, SEEK_SET); - if (loop_write(fd, id, 33, false) == 33) { - r = 0; - goto finish; - } + if (loop_write(fd, id, 33, false) == 33) + return 0; } - close_nointr_nofail(fd); - fd = -1; + fd = safe_close(fd); /* Hmm, we couldn't write it? So let's write it to * /run/machine-id as a replacement */ RUN_WITH_UMASK(0022) { - r = write_string_file("/run/machine-id", id); + r = write_string_file(run_machine_id, id); } if (r < 0) { - log_error("Cannot write /run/machine-id: %s", strerror(-r)); - - unlink("/run/machine-id"); - goto finish; + log_error("Cannot write %s: %s", run_machine_id, strerror(-r)); + unlink(run_machine_id); + return r; } /* And now, let's mount it over */ - r = mount("/run/machine-id", "/etc/machine-id", NULL, MS_BIND, NULL) < 0 ? -errno : 0; + r = mount(run_machine_id, etc_machine_id, NULL, MS_BIND, NULL); if (r < 0) { - unlink("/run/machine-id"); - log_error("Failed to mount /etc/machine-id: %s", strerror(-r)); - } else { - log_info("Installed transient /etc/machine-id file."); - - /* Mark the mount read-only */ - if (mount(NULL, "/etc/machine-id", NULL, - MS_BIND|MS_RDONLY|MS_REMOUNT, NULL) < 0) - log_warning("Failed to make transient /etc/machine-id read-only"); + log_error("Failed to mount %s: %m", etc_machine_id); + unlink_noerrno(run_machine_id); + return -errno; } -finish: + log_info("Installed transient %s file.", etc_machine_id); - if (fd >= 0) - close_nointr_nofail(fd); + /* Mark the mount read-only */ + if (mount(NULL, etc_machine_id, NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, NULL) < 0) + log_warning("Failed to make transient %s read-only: %m", etc_machine_id); - return r; + return 0; }