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

Commit e34b970f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

init: Fix some more mergefails 

Change-Id: I6fbb230e0f0f4e93f25fb571ae2fb6ccfd12398e
parent 78dfb9a0

init/builtins.c

+0 −10
Original line number Diff line number Diff line
@@ -905,16 +905,6 @@ int do_setsebool(int nargs, char **args) { 
        return ret;

    }



=======

    }



    if (security_set_boolean_list(1, &b, 0) < 0) {

        ret = -errno;

        ERROR("setsebool: could not set %s to %s\n", name, value);

        return ret;

    }

#endif

>>>>>>> Change setsebool syntax to be consistent with other init built-ins.

    return 0;

}

init/init.c

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ void service_start(struct service *svc, const char *dynamic_args) 
    int needs_console;

    int n;

    char *scon = NULL;

#ifdef HAVE_SELINUX

    int rc;



        /* starting a service removes it from the disabled or reset

init/util.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int create_socket(const char *name, int type, mode_t perm, uid_t uid, gid_t gid, 
{

    struct sockaddr_un addr;

    int fd, ret;

    char *secon;

    char *filecon;



    if (socketcon)

        setsockcreatecon(socketcon);