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

Commit aa4051dc authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 2f924ebe: am a94d2b39: Merge "Add a restorecon_recursive built-in command to init." 

* commit '2f924ebe':
  Add a restorecon_recursive built-in command to init.
parents 33d1e629 2f924ebe

init/builtins.c

+14 −2
Original line number Diff line number Diff line
@@ -797,12 +797,24 @@ int do_chmod(int nargs, char **args) { 


int do_restorecon(int nargs, char **args) {

    int i;

    int ret = 0;



    for (i = 1; i < nargs; i++) {

        if (restorecon(args[i]) < 0)

            return -errno;

            ret = -errno;

    }

    return 0;

    return ret;

}



int do_restorecon_recursive(int nargs, char **args) {

    int i;

    int ret = 0;



    for (i = 1; i < nargs; i++) {

        if (restorecon_recursive(args[i]) < 0)

            ret = -errno;

    }

    return ret;

}



int do_setsebool(int nargs, char **args) {

init/init_parser.c

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ int lookup_keyword(const char *s) 
    case 'r':

        if (!strcmp(s, "estart")) return K_restart;

        if (!strcmp(s, "estorecon")) return K_restorecon;

        if (!strcmp(s, "estorecon_recursive")) return K_restorecon_recursive;

        if (!strcmp(s, "mdir")) return K_rmdir;

        if (!strcmp(s, "m")) return K_rm;

        break;

init/keywords.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ int do_mount(int nargs, char **args); 
int do_powerctl(int nargs, char **args);

int do_restart(int nargs, char **args);

int do_restorecon(int nargs, char **args);

int do_restorecon_recursive(int nargs, char **args);

int do_rm(int nargs, char **args);

int do_rmdir(int nargs, char **args);

int do_setcon(int nargs, char **args);
@@ -71,6 +72,7 @@ enum { 
    KEYWORD(powerctl,    COMMAND, 1, do_powerctl)

    KEYWORD(restart,     COMMAND, 1, do_restart)

    KEYWORD(restorecon,  COMMAND, 1, do_restorecon)

    KEYWORD(restorecon_recursive,  COMMAND, 1, do_restorecon_recursive)

    KEYWORD(rm,          COMMAND, 1, do_rm)

    KEYWORD(rmdir,       COMMAND, 1, do_rmdir)

    KEYWORD(seclabel,    OPTION,  0, 0)

init/readme.txt

+7 −1
Original line number Diff line number Diff line
@@ -192,12 +192,18 @@ mount <type> <device> <dir> [ <mountoption> ]* 
   device by name.

   <mountoption>s include "ro", "rw", "remount", "noatime", ...



restorecon <path>

restorecon <path> [ <path> ]*

   Restore the file named by <path> to the security context specified

   in the file_contexts configuration.

   Not required for directories created by the init.rc as these are

   automatically labeled correctly by init.



restorecon_recursive <path> [ <path> ]*

   Recursively restore the directory tree named by <path> to the

   security contexts specified in the file_contexts configuration.

   Do NOT use this with paths leading to shell-writable or app-writable

   directories, e.g. /data/local/tmp, /data/data or any prefix thereof.



setcon <securitycontext>

   Set the current process security context to the specified string.

   This is typically only used from early-init to set the init context