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

Commit 3bb2fca8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 99063631: am 26c4c905: Merge "Remove chroot from init." 

* commit '99063631':
  Remove chroot from init.
parents c88b0640 99063631

init/builtins.cpp

+0 −6
Original line number Diff line number Diff line
@@ -104,12 +104,6 @@ static void service_start_if_not_disabled(struct service *svc) 
    }

}



int do_chroot(int nargs, char **args)

{

    chroot(args[1]);

    return 0;

}



int do_class_start(int nargs, char **args)

{

        /* Starting a class does not start services

init/init_parser.cpp

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

        if (!strcmp(s, "opy")) return K_copy;

        if (!strcmp(s, "apability")) return K_capability;

        if (!strcmp(s, "hroot")) return K_chroot;

        if (!strcmp(s, "lass")) return K_class;

        if (!strcmp(s, "lass_start")) return K_class_start;

        if (!strcmp(s, "lass_stop")) return K_class_stop;

init/keywords.h

+0 −2
Original line number Diff line number Diff line 
#ifndef KEYWORD

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

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

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

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

int do_class_reset(int nargs, char **args);
@@ -45,7 +44,6 @@ enum { 
    K_UNKNOWN,

#endif

    KEYWORD(capability,  OPTION,  0, 0)

    KEYWORD(chroot,      COMMAND, 1, do_chroot)

    KEYWORD(class,       OPTION,  0, 0)

    KEYWORD(class_start, COMMAND, 1, do_class_start)

    KEYWORD(class_stop,  COMMAND, 1, do_class_stop)

init/readme.txt

+0 −3
Original line number Diff line number Diff line
@@ -170,9 +170,6 @@ chmod <octal-mode> <path> 
chown <owner> <group> <path>

   Change file owner and group.



chroot <directory>

  Change process root directory.



class_start <serviceclass>

   Start all services of the specified class if they are

   not already running.