picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

machine-id-setup: allow passing NULL as function argument, for simplicity

Browse source
This commit is contained in:
Lennart Poettering 2014-06-17 03:25:02 +02:00
parent c47fc1f025
commit 489388fbc0
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/machine-id-setup.c
View file

@ -157,18 +157,23 @@ static int generate(char id[34], const char *root) {
}
int machine_id_setup(const char *root) {
const char *etc_machine_id, *run_machine_id;
_cleanup_close_ int fd = -1;
int r;
bool writable = false;
struct stat st;
char id[34]; /* 32 + \n + \0 */
char *etc_machine_id, *run_machine_id;
int r;
etc_machine_id = strappenda(root, "/etc/machine-id");
path_kill_slashes(etc_machine_id);
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(run_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

2
src/core/main.c
View file

@ -1592,7 +1592,7 @@ int main(int argc, char *argv[]) {
kmod_setup();
#endif
hostname_setup();
machine_id_setup("");
machine_id_setup(NULL);
loopback_setup();
test_mtab();