commit 16cec83a6604777ffdf89b72d9fc474f0c0b73b5
author Robin Lee <rgl@google.com> Wed Jul 09 17:36:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 09 17:36:12 2014 +0000
tree d28bf8f904e9f58301be9b011dc9d48433719eba
parent fe91d89b4f33f753b8b20049221609af7b552b9d
parent 8098af6ea29e9d28a6314d12963cef3107de9c18

am 8098af6e: am 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"

* commit '8098af6ea29e9d28a6314d12963cef3107de9c18':
  Rename 'mkuser' command to 'mkuserconfig'

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 01032f3..41a8f30 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -269,7 +269,7 @@
     return 0;
 }
 
-int create_user(userid_t userid)
+int make_user_config(userid_t userid)
 {
     if (ensure_config_user_dirs(userid) == -1) {
         return -1;

cmds/installd/installd.c

diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c
index 45cc2b2..e072d0d 100644
--- a/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@ -109,9 +109,9 @@
                              /* pkgname, uid, userid, seinfo */
 }
 
-static int do_mk_user(char **arg, char reply[REPLY_MAX])
+static int do_mk_user_config(char **arg, char reply[REPLY_MAX])
 {
-    return create_user(atoi(arg[0])); /* userid */
+    return make_user_config(atoi(arg[0])); /* userid */
 }
 
 static int do_rm_user(char **arg, char reply[REPLY_MAX])
@@ -168,7 +168,7 @@
     { "movefiles",            0, do_movefiles },
     { "linklib",              3, do_linklib },
     { "mkuserdata",           4, do_mk_user_data },
-    { "mkuser",               1, do_mk_user },
+    { "mkuserconfig",         1, do_mk_user_config },
     { "rmuser",               1, do_rm_user },
     { "idmap",                3, do_idmap },
     { "restorecondata",       3, do_restorecon_data },

cmds/installd/installd.h

diff --git a/cmds/installd/installd.h b/cmds/installd/installd.h
index f193b46..258647a 100644
--- a/cmds/installd/installd.h
+++ b/cmds/installd/installd.h
@@ -204,7 +204,7 @@
 int fix_uid(const char *pkgname, uid_t uid, gid_t gid);
 int delete_user_data(const char *pkgname, userid_t userid);
 int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* seinfo);
-int create_user(userid_t userid);
+int make_user_config(userid_t userid);
 int delete_user(userid_t userid);
 int delete_cache(const char *pkgname, userid_t userid);
 int move_dex(const char *src, const char *dst, const char *instruction_set);