From 7c8bec01790087748ec7afa69a31789828b751f9 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Tue, 10 Jun 2014 18:46:26 +0100
Subject: [PATCH] Rename 'mkuser' command to 'mkuserconfig'

Brings the name more in line with what it actually does.

Change-Id: I0adb14deb1a035abdbe51714356bd0c94ccf04c5
---
 cmds/installd/commands.c | 2 +-
 cmds/installd/installd.c | 6 +++---
 cmds/installd/installd.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 891157042..4d57dea87 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -265,7 +265,7 @@ int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char*
     return 0;
 }
 
-int create_user(userid_t userid)
+int make_user_config(userid_t userid)
 {
     if (ensure_config_user_dirs(userid) == -1) {
         return -1;
diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c
index f71483681..719988627 100644
--- a/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@ -109,9 +109,9 @@ static int do_mk_user_data(char **arg, char reply[REPLY_MAX])
                              /* 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])
@@ -162,7 +162,7 @@ struct cmdinfo cmds[] = {
     { "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 },
diff --git a/cmds/installd/installd.h b/cmds/installd/installd.h
index ff26e49bc..69b34c8e3 100644
--- a/cmds/installd/installd.h
+++ b/cmds/installd/installd.h
@@ -204,7 +204,7 @@ int renamepkg(const char *oldpkgname, const char *newpkgname);
 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);