summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-03-18 17:15:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-18 17:15:06 +0000
commit07d457c06c146cd1a6750412ab40b555e820e110 (patch)
treede9d7544787a92493a6834fe19855a11969fc734 /init
parent1b60da7d534e1f004b19ebeddc066f4ce1c1c750 (diff)
parent169d029c763a7e652e6d22ae42bb23707675541b (diff)
downloadsystem_core-07d457c06c146cd1a6750412ab40b555e820e110.zip
system_core-07d457c06c146cd1a6750412ab40b555e820e110.tar.gz
system_core-07d457c06c146cd1a6750412ab40b555e820e110.tar.bz2
am 169d029c: am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."
* commit '169d029c763a7e652e6d22ae42bb23707675541b': Switch init over to _PATH_DEFPATH.
Diffstat (limited to 'init')
-rw-r--r--init/init.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/init/init.cpp b/init/init.cpp
index 36066b2..6b6ad8b 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -19,6 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <libgen.h>
+#include <paths.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
@@ -1015,6 +1016,8 @@ int main(int argc, char** argv) {
// Clear the umask.
umask(0);
+ add_environment("PATH", _PATH_DEFPATH);
+
// 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.
mkdir("/dev", 0755);