|
3 | 3 | Date: Sun, 10 Jan 2021 05:10:39 +0000
|
4 | 4 | Subject: [PATCH] Restore /sbin
|
5 | 5 |
|
6 |
| -This reverts "Do not create /sbin" and "Remove sbin from fs_config.cpp". |
| 6 | +This reverts "Do not create /sbin" and "Remove sbin from fs_config.cpp" and adds /sbin to the PATH. |
7 | 7 |
|
8 | 8 | Change-Id: Iade1d5e8ec8df8e3dcfbdeef3367dbe56996ae6f
|
9 | 9 | ---
|
10 |
| - CleanSpec.mk | 2 -- |
11 |
| - libcutils/fs_config.cpp | 3 +++ |
12 |
| - rootdir/Android.mk | 2 +- |
13 |
| - 3 files changed, 4 insertions(+), 3 deletions(-) |
| 10 | + CleanSpec.mk | 2 -- |
| 11 | + libcutils/fs_config.cpp | 3 +++ |
| 12 | + rootdir/Android.mk | 2 +- |
| 13 | + rootdir/init.environ.rc.in | 1 + |
| 14 | + 4 files changed, 5 insertions(+), 3 deletions(-) |
14 | 15 |
|
15 | 16 | diff --git a/CleanSpec.mk b/CleanSpec.mk
|
16 | 17 | index 0a534a2bd..81150a0fa 100644
|
@@ -66,6 +67,18 @@ index 7d383f522..6d518dcb3 100644
|
66 | 67 | linkerconfig postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \
|
67 | 68 | ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \
|
68 | 69 | ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \
|
| 70 | +diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in |
| 71 | +index fdaaf1abe..b34145829 100644 |
| 72 | +--- a/rootdir/init.environ.rc.in |
| 73 | ++++ b/rootdir/init.environ.rc.in |
| 74 | +@@ -10,6 +10,7 @@ on early-init |
| 75 | + export ANDROID_TZDATA_ROOT /apex/com.android.tzdata |
| 76 | + export EXTERNAL_STORAGE /sdcard |
| 77 | + export ASEC_MOUNTPOINT /mnt/asec |
| 78 | ++ export PATH /sbin:/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/system_ext/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin |
| 79 | + export BOOTCLASSPATH %BOOTCLASSPATH% |
| 80 | + export DEX2OATBOOTCLASSPATH %DEX2OATBOOTCLASSPATH% |
| 81 | + export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH% |
69 | 82 | --
|
70 | 83 | 2.25.1
|
71 | 84 |
|
0 commit comments