Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c5be65f authored by Robin Lee's avatar Robin Lee Committed by Gerrit Code Review
Browse files

Merge "Rename 'mkuser' command to 'mkuserconfig'"

parents cbb9d0d7 7c8bec01

cmds/installd/commands.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,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;

cmds/installd/installd.c

+3 −3
Original line number Diff line number Diff line
@@ -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])
@@ -168,7 +168,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 },

cmds/installd/installd.h

+1 −1
Original line number Diff line number Diff line
@@ -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);