ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Switch init over to _PATH_DEFPATH."

Browse source
This commit is contained in:
Elliott Hughes 2015-03-18 16:53:48 +00:00 • committed by Gerrit Code Review
commit 789c99a48e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/init.cpp
View file

@ -18,6 +18,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <libgen.h> #include <libgen.h>
#include <paths.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@ -988,6 +989,8 @@ int main(int argc, char** argv) {
// Clear the umask. // Clear the umask.
umask(0); umask(0);
add_environment("PATH", _PATH_DEFPATH);
// Get the basic filesystem setup we need put together in the initramdisk // Get the basic filesystem setup we need put together in the initramdisk
// on / and then we'll let the rc file figure out the rest. // on / and then we'll let the rc file figure out the rest.
mkdir("/dev", 0755); mkdir("/dev", 0755);

1
rootdir/init.environ.rc.in
View file

@ -1,6 +1,5 @@
# set up the global environment # set up the global environment
on init on init
export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
export ANDROID_BOOTLOGO 1 export ANDROID_BOOTLOGO 1
export ANDROID_ROOT /system export ANDROID_ROOT /system
export ANDROID_ASSETS /system/app export ANDROID_ASSETS /system/app