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

Commit 7bfea3d5 authored by Tom Cherry's avatar Tom Cherry
Browse files

init: clean up the 1st/2nd stage init split 

The first split of 1st/2nd stage init went a bit overboard, since it
split these even in the case of the recovery image and system-as-root,
which don't actually need the split.  This change simplifies this a
bit:

system-as-root and recovery have a single combined /system/bin/init
and a symlink from /init to it.

non-system-as-root has a separate first stage init at /init on the
first stage ramdisk and a combined /system/bin/init on system.img.

Two particular benefits from this:
1) Removal of the rsync of TARGET_RAMDISK_OUT to the recovery image
2) Decrease of overall space on the recovery image since it won't have
   a statically linked first stage init

This also unified the various entry points of init to depend entirely
on the arguments passed to it, instead of the hybrid of arguments and
environment variable used previously.

Bug: 80395578
Test: boot both system-as-root and non-system-as-root
Change-Id: Ic2f29b6f56b7defc80eaa0e7cd0c9107e978816f
parent 13856a05

init/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ cc_defaults { 
        "libkeyutils",

        "liblog",

        "liblogwrap",

        "liblp",

        "libselinux",

        "libutils",

    ],
@@ -99,6 +100,7 @@ cc_library_static { 
        "devices.cpp",

        "epoll.cpp",

        "firmware_handler.cpp",

        "first_stage_init.cpp",

        "first_stage_mount.cpp",

        "import_parser.cpp",

        "init.cpp",
@@ -117,6 +119,7 @@ cc_library_static { 
        "sigchld_handler.cpp",

        "subcontext.cpp",

        "subcontext.proto",

        "switch_root.cpp",

        "rlimit_parser.cpp",

        "tokenizer.cpp",

        "uevent_listener.cpp",

init/Android.mk

+7 −9
Original line number Diff line number Diff line
@@ -39,12 +39,15 @@ init_cflags += \ 


# --



# Do not build this even with mmma if we're system-as-root, otherwise it will overwrite the symlink.

ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

include $(CLEAR_VARS)

LOCAL_CPPFLAGS := $(init_cflags)

LOCAL_SRC_FILES := \

    devices.cpp \

    first_stage_init.cpp \

    first_stage_main.cpp \

    first_stage_mount.cpp \

    init_first_stage.cpp \

    reboot_utils.cpp \

    selinux.cpp \

    switch_root.cpp \
@@ -93,19 +96,16 @@ LOCAL_SANITIZE := signed-integer-overflow 
# First stage init is weird: it may start without stdout/stderr, and no /proc.

LOCAL_NOSANITIZE := hwaddress

include $(BUILD_EXECUTABLE)

endif



include $(CLEAR_VARS)



LOCAL_MODULE := init_system

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

LOCAL_REQUIRED_MODULES := \

   init_first_stage \

   init_second_stage \



else

LOCAL_REQUIRED_MODULES := \

   init_second_stage \



ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

LOCAL_POST_INSTALL_CMD := ln -sf /system/bin/init $(TARGET_ROOT_OUT)/init

endif

include $(BUILD_PHONY_PACKAGE)
@@ -118,5 +118,3 @@ LOCAL_REQUIRED_MODULES := \ 


endif

include $(BUILD_PHONY_PACKAGE)

init/init_first_stage.cpp→init/first_stage_init.cpp

+4 −6
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#include "first_stage_init.h"



#include <dirent.h>

#include <fcntl.h>

#include <paths.h>
@@ -94,7 +96,7 @@ bool ForceNormalBoot() { 


}  // namespace



int main(int argc, char** argv) {

int FirstStageMain(int argc, char** argv) {

    if (REBOOT_BOOTLOADER_ON_PANIC) {

        InstallRebootSignalHandlers();

    }
@@ -214,7 +216,7 @@ int main(int argc, char** argv) { 
    setenv("INIT_STARTED_AT", std::to_string(start_ms).c_str(), 1);



    const char* path = "/system/bin/init";

    const char* args[] = {path, nullptr};

    const char* args[] = {path, "selinux_setup", nullptr};

    execv(path, const_cast<char**>(args));



    // execv() only returns if an error happened, in which case we
@@ -226,7 +228,3 @@ int main(int argc, char** argv) { 


}  // namespace init

}  // namespace android
 


int main(int argc, char** argv) {

    return android::init::main(argc, argv);

}

init/first_stage_init.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



namespace android {

namespace init {



int FirstStageMain(int argc, char** argv);



}  // namespace init

}  // namespace android

init/first_stage_main.cpp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "first_stage_init.h"



int main(int argc, char** argv) {

    return android::init::FirstStageMain(argc, argv);

}