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

am b31c3a5a: am 178299fd: Merge "init: don\'t double mount /proc and /sys"

Browse source 
* commit 'b31c3a5a453cd9f472698068af9909e80a96ab2c':
  init: don't double mount /proc and /sys
This commit is contained in:
Nick Kralevich 2015-04-25 23:28:45 +00:00 • committed by Android Git Automerger
commit 1c2457ffda
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
init/init.cpp
View file

@ -981,14 +981,20 @@ int main(int argc, char** argv) {
add_environment("PATH", _PATH_DEFPATH); add_environment("PATH", _PATH_DEFPATH);
bool is_first_stage = (argc == 1) || (strcmp(argv[1], "--second-stage") != 0);
// 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.
// TODO: avoid mounting tmpfs twice, once in the first stage, and once in the
// second stage.
mount("tmpfs", "/dev", "tmpfs", MS_NOSUID, "mode=0755"); mount("tmpfs", "/dev", "tmpfs", MS_NOSUID, "mode=0755");
mkdir("/dev/pts", 0755); mkdir("/dev/pts", 0755);
mkdir("/dev/socket", 0755); mkdir("/dev/socket", 0755);
mount("devpts", "/dev/pts", "devpts", 0, NULL); mount("devpts", "/dev/pts", "devpts", 0, NULL);
mount("proc", "/proc", "proc", 0, NULL); if (is_first_stage) {
mount("sysfs", "/sys", "sysfs", 0, NULL); mount("proc", "/proc", "proc", 0, NULL);
mount("sysfs", "/sys", "sysfs", 0, NULL);
}
// Indicate that booting is in progress to background fw loaders, etc. // Indicate that booting is in progress to background fw loaders, etc.
close(open("/dev/.booting", O_WRONLY | O_CREAT | O_CLOEXEC, 0000)); close(open("/dev/.booting", O_WRONLY | O_CREAT | O_CLOEXEC, 0000));
@ -1001,7 +1007,6 @@ int main(int argc, char** argv) {
klog_init(); klog_init();
klog_set_level(KLOG_NOTICE_LEVEL); klog_set_level(KLOG_NOTICE_LEVEL);
bool is_first_stage = (argc == 1) || (strcmp(argv[1], "--second-stage") != 0);
NOTICE("init%s started!\n", is_first_stage ? "" : " second stage"); NOTICE("init%s started!\n", is_first_stage ? "" : " second stage");
property_init(); property_init();