summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-07-16 21:23:41 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-07-16 22:25:43 +0200
commit2d68234505cf369bb35b8a34c88fb2d06460e721 (patch)
tree6e2a38a7d323bba9a1fd653019fe4cd82cbf6f6f
parent8cfb03bb021cf9bff79b1ee4315b541cce05b2fb (diff)
downloadcore-GNUtoo/history/devtmpfs-debug-wip.tar.gz
core-GNUtoo/history/devtmpfs-debug-wip.tar.bz2
core-GNUtoo/history/devtmpfs-debug-wip.zip
Diff between tmpfs and devtmpfs obtained through shell by modifying init.smdk*.rc --- a/init.smdk4x12.rc +++ b/init.smdk4x12.rc on fs mount_all /fstab.smdk4x12 + start console --- tmpfs.txt +++ devtmpfs_shell.txt +./fb0 +./fscklogs/log +./hwrng +./loop0 +./loop1 +./loop2 +./loop3 +./loop4 +./loop5 +./loop6 +./loop7 +./mapper +./mapper/control +./mmcblk2 +./mmcblk2boot0 +./mmcblk2boot1 +./mmcblk2p1 +./mmcblk2p10 +./mmcblk2p11 +./mmcblk2p12 +./mmcblk2p2 +./mmcblk2p3 +./mmcblk2p4 +./mmcblk2p5 +./mmcblk2p6 +./mmcblk2p7 +./mmcblk2p8 +./mmcblk2p9 +./net +./net/tun -./pts/0 +./ram0 +./ram1 +./ram10 +./ram11 +./ram12 +./ram13 +./ram14 +./ram15 +./ram2 +./ram3 +./ram4 +./ram5 +./ram6 +./ram7 +./ram8 +./ram9 -./socket/adbd -./socket/lmkd -./socket/statsdw -./socket/tombstoned_crash -./socket/tombstoned_intercept -./socket/tombstoned_java_trace -./socket/zygote -./usb-ffs -./usb-ffs/adb -./usb-ffs/adb/ep0 -./usb-ffs/adb/ep1 -./usb-ffs/adb/ep2 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--init/init.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/init/init.cpp b/init/init.cpp
index daaf9ad57..ea05445f7 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -628,22 +628,30 @@ int main(int argc, char** argv) {
if (!DoFirstStageMount()) {
LOG(FATAL) << "Failed to mount required partitions early ...";
}
+ LOG(INFO) << "DoFirstStageMount done!";
SetInitAvbVersionInRecovery();
+ LOG(INFO) << "SetInitAvbVersionInRecovery done";
+
// Enable seccomp if global boot option was passed (otherwise it is enabled in zygote).
global_seccomp();
+ LOG(INFO) << "global_seccomp done";
// Set up SELinux, loading the SELinux policy.
SelinuxSetupKernelLogging();
SelinuxInitialize();
+ LOG(INFO) << "selinux init done";
+
// We're in the kernel domain, so re-exec init to transition to the init domain now
// that the SELinux policy has been loaded.
if (selinux_android_restorecon("/init", 0) == -1) {
PLOG(FATAL) << "restorecon failed of /init failed";
}
+ LOG(INFO) << "restorecon /init done!";
+
setenv("INIT_SECOND_STAGE", "true", 1);
static constexpr uint32_t kNanosecondsPerMillisecond = 1e6;
@@ -657,6 +665,8 @@ int main(int argc, char** argv) {
// execv() only returns if an error happened, in which case we
// panic and never fall through this conditional.
PLOG(FATAL) << "execv(\"" << path << "\") failed";
+
+ LOG(INFO) << "main done!";
}
// At this point we're in the second stage of init.