[gdm/wip/initial-setup2] initial-setup: Be more careful when copying data

[Matthias Clasen <matthiasc src gnome org>]

commit a4c1ce35b6e546c88074ed5239885e2ef739bcd5
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Apr 15 23:56:06 2012 -0400

    initial-setup: Be more careful when copying data
    
    install creates parent directories with 'default permissions'.
    This means that .config/dconf/ end up being owned by root,
    which does not work well. We need to explicitly create the
    directories beforehand with the right owner.

 gui/initial-setup/gdm-initial-setup.c |   50 +++++++++++++++++++++++++-------
 1 files changed, 39 insertions(+), 11 deletions(-)
---
diff --git a/gui/initial-setup/gdm-initial-setup.c b/gui/initial-setup/gdm-initial-setup.c
index 1336980..d2fa9b3 100644
--- a/gui/initial-setup/gdm-initial-setup.c
+++ b/gui/initial-setup/gdm-initial-setup.c
@@ -1666,7 +1666,8 @@ prepare_online_page (SetupData *setup)
 static void
 copy_account_data (SetupData *setup)
 {
-        const gchar *username, *to, *from;
+        const gchar *username;
+        gchar *to1, *to2, *to, *from;
         gchar *argv[12];
         GError *error = NULL;
 
@@ -1680,25 +1681,52 @@ copy_account_data (SetupData *setup)
         username = act_user_get_user_name (setup->act_user);
 
         from = g_build_filename (g_get_home_dir (), ".config", "dconf", "user", NULL);
-        to = g_build_filename (act_user_get_home_dir (setup->act_user), ".config", "dconf", "user", NULL);
+        to1 = g_build_filename (act_user_get_home_dir (setup->act_user), ".config", NULL);
+        to2 = g_build_filename (to1, "dconf", NULL);
+        to = g_build_filename (to2, "user", NULL);
 
         argv[0] = "/usr/bin/pkexec";
         argv[1] = "install";
-        argv[2] = "-D";
-        argv[3] = "--owner";
-        argv[4] = (gchar *)username;
-        argv[5] = "--group";
-        argv[6] = (gchar *)username;
-        argv[7] = "--mode";
-        argv[8] = "644";
-        argv[9] = (gchar *)from;
-        argv[10] = (gchar *)to;
+        argv[2] = "--owner";
+        argv[3] = (gchar *)username;
+        argv[4] = "--group";
+        argv[5] = (gchar *)username;
+        argv[6] = "--mode";
+        argv[7] = "755";
+        argv[8] = "--directory";
+        argv[9] = to1;
+        argv[10] = to2;
         argv[11] = NULL;
 
         if (!g_spawn_sync (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, NULL, &error)) {
                 g_warning ("Failed to copy account data: %s", error->message);
                 g_error_free (error);
+                goto out;
         }
+
+        argv[0] = "/usr/bin/pkexec";
+        argv[1] = "install";
+        argv[2] = "--owner";
+        argv[3] = (gchar *)username;
+        argv[4] = "--group";
+        argv[5] = (gchar *)username;
+        argv[6] = "--mode";
+        argv[7] = "644";
+        argv[8] = from;
+        argv[9] = to;
+        argv[10] = NULL;
+
+        if (!g_spawn_sync (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, NULL, &error)) {
+                g_warning ("Failed to copy account data: %s", error->message);
+                g_error_free (error);
+                goto out;
+        }
+
+out:
+        g_free (from);
+        g_free (to1);
+        g_free (to2);
+        g_free (to);
 }
 
 static void