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

Commit c7ca9dd6 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Revert "Revert "Remove now-unusable 'setcon' command."" 

This reverts commit b862bd00.

This change was fine but an earlier change it depended on was broken.
That change has been fixed and resubmitted.

Bug: http://b/19702273
Change-Id: I17e565721026e48e2a73526f729f2481d4d6edb5
parent 132440b0

init/builtins.cpp

+0 −9
Original line number Diff line number Diff line
@@ -515,15 +515,6 @@ int do_swapon_all(int nargs, char **args) 
    return ret;

}



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

    if (is_selinux_enabled() <= 0)

        return 0;

    if (setcon(args[1]) < 0) {

        return -errno;

    }

    return 0;

}



int do_setprop(int nargs, char **args)

{

    const char *name = args[1];

init/init_parser.cpp

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

        if (!strcmp(s, "eclabel")) return K_seclabel;

        if (!strcmp(s, "ervice")) return K_service;

        if (!strcmp(s, "etcon")) return K_setcon;

        if (!strcmp(s, "etenv")) return K_setenv;

        if (!strcmp(s, "etprop")) return K_setprop;

        if (!strcmp(s, "etrlimit")) return K_setrlimit;

init/keywords.h

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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);

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

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

int do_start(int nargs, char **args);
@@ -76,7 +75,6 @@ enum { 
    KEYWORD(rmdir,       COMMAND, 1, do_rmdir)

    KEYWORD(seclabel,    OPTION,  0, 0)

    KEYWORD(service,     SECTION, 0, 0)

    KEYWORD(setcon,      COMMAND, 1, do_setcon)

    KEYWORD(setenv,      OPTION,  2, 0)

    KEYWORD(setprop,     COMMAND, 2, do_setprop)

    KEYWORD(setrlimit,   COMMAND, 3, do_setrlimit)

init/readme.txt

+0 −5
Original line number Diff line number Diff line
@@ -252,11 +252,6 @@ rm <path> 
rmdir <path>

   Calls rmdir(2) on the given path.



setcon <seclabel>

   Set the current process security context to the specified string.

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

   before any other process is started.



setprop <name> <value>

   Set system property <name> to <value>. Properties are expanded

   within <value>.