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

Commit ef8229fb authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Use /bootstrap-apex for bootstrap APEXes" into main am: 370ee1bb 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700774



Change-Id: I98404432e5d8a6d355388728200133e84a469ebb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 611837f4 370ee1bb

init/init.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -832,6 +832,12 @@ static void MountExtraFilesystems() { 
    CHECKCALL(mount("tmpfs", "/apex", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,

    CHECKCALL(mount("tmpfs", "/apex", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,

                    "mode=0755,uid=0,gid=0"));

                    "mode=0755,uid=0,gid=0"));





    if (NeedsTwoMountNamespaces()) {

        // /bootstrap-apex is used to mount "bootstrap" APEXes.

        CHECKCALL(mount("tmpfs", "/bootstrap-apex", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,

                        "mode=0755,uid=0,gid=0"));

    }



    // /linkerconfig is used to keep generated linker configuration

    // /linkerconfig is used to keep generated linker configuration

    CHECKCALL(mount("tmpfs", "/linkerconfig", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,

    CHECKCALL(mount("tmpfs", "/linkerconfig", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,

                    "mode=0755,uid=0,gid=0"));

                    "mode=0755,uid=0,gid=0"));

init/mount_namespace.cpp

+26 −9
Original line number Original line Diff line number Diff line
@@ -66,15 +66,6 @@ static std::string GetMountNamespaceId() { 
    return ret;

    return ret;

}

}





// In case we have two sets of APEXes (non-updatable, updatable), we need two separate mount

// namespaces.

static bool NeedsTwoMountNamespaces() {

    if (IsRecoveryMode()) return false;

    // In microdroid, there's only one set of APEXes in built-in directories include block devices.

    if (IsMicrodroid()) return false;

    return true;

}



static android::base::unique_fd bootstrap_ns_fd;

static android::base::unique_fd bootstrap_ns_fd;

static android::base::unique_fd default_ns_fd;

static android::base::unique_fd default_ns_fd;
@@ -83,6 +74,15 @@ static std::string default_ns_id; 




}  // namespace

}  // namespace





// In case we have two sets of APEXes (non-updatable, updatable), we need two separate mount

// namespaces.

bool NeedsTwoMountNamespaces() {

    if (IsRecoveryMode()) return false;

    // In microdroid, there's only one set of APEXes in built-in directories include block devices.

    if (IsMicrodroid()) return false;

    return true;

}



bool SetupMountNamespaces() {

bool SetupMountNamespaces() {

    // Set the propagation type of / as shared so that any mounting event (e.g.

    // Set the propagation type of / as shared so that any mounting event (e.g.

    // /data) is by default visible to all processes. When private mounting is

    // /data) is by default visible to all processes. When private mounting is
@@ -163,6 +163,23 @@ bool SetupMountNamespaces() { 
            PLOG(ERROR) << "Cannot switch back to bootstrap mount namespace";

            PLOG(ERROR) << "Cannot switch back to bootstrap mount namespace";

            return false;

            return false;

        }

        }



        // Some components (e.g. servicemanager) need to access bootstrap

        // APEXes from the default mount namespace. To achieve that, we bind-mount

        // /apex to /bootstrap-apex in the bootstrap mount namespace. Since /bootstrap-apex

        // is "shared", the mounts are visible in the default mount namespace as well.

        //

        // The end result will look like:

        //   in the bootstrap mount namespace:

        //     /apex  (== /bootstrap-apex)

        //       {bootstrap APEXes from the read-only partition}

        //

        //   in the default mount namespace:

        //     /bootstrap-apex

        //       {bootstrap APEXes from the read-only partition}

        //     /apex

        //       {APEXes, can be from /data partition}

        if (!(BindMount("/bootstrap-apex", "/apex"))) return false;

    } else {

    } else {

        // Otherwise, default == bootstrap

        // Otherwise, default == bootstrap

        default_ns_fd.reset(OpenMountNamespace());

        default_ns_fd.reset(OpenMountNamespace());

init/mount_namespace.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -24,9 +24,12 @@ namespace init { 
enum MountNamespace { NS_BOOTSTRAP, NS_DEFAULT };

enum MountNamespace { NS_BOOTSTRAP, NS_DEFAULT };





bool SetupMountNamespaces();

bool SetupMountNamespaces();



base::Result<void> SwitchToMountNamespaceIfNeeded(MountNamespace target_mount_namespace);

base::Result<void> SwitchToMountNamespaceIfNeeded(MountNamespace target_mount_namespace);





base::Result<MountNamespace> GetCurrentMountNamespace();

base::Result<MountNamespace> GetCurrentMountNamespace();





bool NeedsTwoMountNamespaces();



}  // namespace init

}  // namespace init

}  // namespace android
 
}  // namespace android

init/selinux.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -757,7 +757,7 @@ void SelinuxRestoreContext() { 
    selinux_android_restorecon("/dev/device-mapper", 0);

    selinux_android_restorecon("/dev/device-mapper", 0);





    selinux_android_restorecon("/apex", 0);

    selinux_android_restorecon("/apex", 0);



    selinux_android_restorecon("/bootstrap-apex", 0);

    selinux_android_restorecon("/linkerconfig", 0);

    selinux_android_restorecon("/linkerconfig", 0);





    // adb remount, snapshot-based updates, and DSUs all create files during

    // adb remount, snapshot-based updates, and DSUs all create files during

rootdir/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ endif 
#

#

# create some directories (some are mount points) and symlinks

# create some directories (some are mount points) and symlinks

LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \

LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \

    dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \

    dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \

    linkerconfig second_stage_resources postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \

    linkerconfig second_stage_resources postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \

    ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \

    ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \

    ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \

    ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \