keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

postprocess: do not hardcode /etc/machine-id

Browse Source 
The file is automatically populated by systemd when it is empty.

Apparently it doesn't work when the file is missing (as of
systemd-219-9.fc22).

https://bugzilla.redhat.com/show_bug.cgi?id=1198700

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-04-14 17:09:20 +02:00
parent ad30a790de
commit 3bf7926adc
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libpriv/rpmostree-postprocess.c
View File

@ -254,15 +254,12 @@ do_kernel_prep (GFile *yumroot,
goto out;
}
/* Copy of code from gnome-continuous; yes, we hardcode
the machine id for now, because distributing pre-generated
initramfs images with dracut/systemd at the moment
effectively requires this.
http://lists.freedesktop.org/archives/systemd-devel/2013-July/011770.html
*/
g_print ("Hardcoding machine-id\n");
/* Ensure the /etc/machine-id file is present and empty. Apparently systemd
doesn't work when the file is missing (as of systemd-219-9.fc22) but it is
correctly populated if the file is there. */
g_print ("Creating empty machine-id\n");
{
const char *hardcoded_machine_id = "45bb3b96146aa94f299b9eb43646eb35\n";
const char *hardcoded_machine_id = "";
gs_unref_object GFile *machineid_path =
g_file_resolve_relative_path (yumroot, "etc/machine-id");
if (!g_file_replace_contents (machineid_path, hardcoded_machine_id,