shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00
Code Releases Activity

Only migrate profile in non-privileged libvirtd instance

Browse Source 
Only the non-privileged libvirtd instance uses $HOME. So avoid
running the code for migrating to XDG directories unless using
a non-privileged libvirtd
This commit is contained in:
Daniel P. Berrange 2012-06-11 12:29:09 +01:00
parent d9f6066598
commit 19c08b5644
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/libvirtd.c
View File

@ -783,6 +783,8 @@ static int migrateProfile(void)
int ret = -1; int ret = -1;
mode_t old_umask; mode_t old_umask;
VIR_DEBUG("Checking if user profile needs migrating");
if (!(home = virGetUserDirectory())) if (!(home = virGetUserDirectory()))
goto cleanup; goto cleanup;
@ -795,6 +797,9 @@ static int migrateProfile(void)
goto cleanup; goto cleanup;
if (!virFileIsDir(old_base) || virFileExists(config_dir)) { if (!virFileIsDir(old_base) || virFileExists(config_dir)) {
VIR_DEBUG("No old profile in '%s' / "
"new profile directory already present '%s'",
old_base, config_dir);
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
@ -830,6 +835,7 @@ static int migrateProfile(void)
goto cleanup; goto cleanup;
} }
VIR_DEBUG("Profile migrated from %s to %s", old_base, config_dir);
ret = 0; ret = 0;
cleanup: cleanup:
@ -1063,7 +1069,8 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (migrateProfile() < 0) if (!privileged &&
migrateProfile() < 0)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
if (config->host_uuid && if (config->host_uuid &&