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

Commit 8a387870 authored by repo sync's avatar repo sync
Browse files

Revert "Reload policy after setting up the data partition." 

This reverts commit fee250d2.
parent 3d32cd93

init/builtins.c

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

}



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

    if (is_selinux_enabled() <= 0)

        return 0;

    return selinux_reload_policy();

}



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

    if (is_selinux_enabled() <= 0)

        return 0;

init/init_parser.c

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ int lookup_keyword(const char *s) 
        break;

    case 's':

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

        if (!strcmp(s, "elinux_reload_policy")) return K_selinux_reload_policy;

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

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

        if (!strcmp(s, "etenforce")) return K_setenforce;

init/keywords.h

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ int do_restart(int nargs, char **args); 
int do_restorecon(int nargs, char **args);

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

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

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

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

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

int do_setkey(int nargs, char **args);
@@ -72,7 +71,6 @@ enum { 
    KEYWORD(rm,          COMMAND, 1, do_rm)

    KEYWORD(rmdir,       COMMAND, 1, do_rmdir)

    KEYWORD(seclabel,    OPTION,  0, 0)

    KEYWORD(selinux_reload_policy,    COMMAND, 0, do_selinux_reload)

    KEYWORD(service,     SECTION, 0, 0)

    KEYWORD(setcon,      COMMAND, 1, do_setcon)

    KEYWORD(setenforce,  COMMAND, 1, do_setenforce)

init/property_service.c

+3 −0
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ int property_set(const char *name, const char *value) 
         * to prevent them from being overwritten by default values.

         */

        write_persistent_property(name, value);

    } else if (strcmp("selinux.reload_policy", name) == 0 &&

               strcmp("1", value) == 0) {

        selinux_reload_policy();

    }

    property_changed(name, value);

    return 0;

rootdir/init.rc

+0 −4
Original line number Diff line number Diff line
@@ -177,9 +177,6 @@ on post-fs 
    mkdir /cache/lost+found 0770 root root



on post-fs-data

    # reload SELinux based on what we find on the data partition

    selinux_reload_policy



    # We chown/chmod /data again so because mount is run as root + defaults

    chown system system /data

    chmod 0771 /data
@@ -413,7 +410,6 @@ service ueventd /sbin/ueventd 
    seclabel u:r:ueventd:s0



on property:selinux.reload_policy=1

    selinux_reload_policy

    restart ueventd

    restart installd