Skip to content

Commit f6560ff

Browse files
committed
Revert "ksud/installer: /odm handling (tiann#2513)"
This reverts commit fd6f839.
1 parent fd6f839 commit f6560ff

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

kernel/core_hook.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
605605

606606
// fixme: use `collect_mounts` and `iterate_mount` to iterate all mountpoint and
607607
// filter the mountpoint whose target is `/data/adb`
608-
try_umount("/odm", true, 0);
609608
try_umount("/system", true, 0);
610609
try_umount("/vendor", true, 0);
611610
try_umount("/product", true, 0);

userspace/ksud/src/installer.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,7 @@ handle_partition() {
309309
return;
310310
fi
311311

312-
# we move the folder to / only if it is a native folder that is not a symlink
313-
if [ -d "/$1" ] && [ ! -L "/$1" ]; then
312+
if [ -L "/system/$1" ] && [ "$(readlink -f /system/$1)" = "/$1" ]; then
314313
ui_print "- Handle partition /$1"
315314
# we create a symlink if module want to access $MODPATH/system/$1
316315
# but it doesn't always work(ie. write it in post-fs-data.sh would fail because it is readonly)
@@ -407,7 +406,6 @@ install_module() {
407406
handle_partition vendor
408407
handle_partition system_ext
409408
handle_partition product
410-
handle_partition odm
411409

412410
if $BOOTMODE; then
413411
mktouch $NVBASE/modules/$MODID/update

0 commit comments

Comments
 (0)