Skip to content

Commit ac28e22

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

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

kernel/core_hook.c

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

590590
// fixme: use `collect_mounts` and `iterate_mount` to iterate all mountpoint and
591591
// filter the mountpoint whose target is `/data/adb`
592-
try_umount("/odm", true, 0);
593592
try_umount("/system", true, 0);
594593
try_umount("/vendor", true, 0);
595594
try_umount("/product", true, 0);

userspace/ksud/src/installer.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,17 @@ handle_partition() {
309309
return;
310310
fi
311311

312+
<<<<<<< HEAD
312313
if [ "$REQUIRE_SYMLINK" = "false" ] || [ -L "/system/$PARTITION" ] && [ "$(readlink -f "/system/$PARTITION")" = "/$PARTITION" ]; then
313314
ui_print "- Handle partition /$PARTITION"
314315
ln -sf "./system/$PARTITION" "$MODPATH/$PARTITION"
316+
=======
317+
if [ -L "/system/$1" ] && [ "$(readlink -f /system/$1)" = "/$1" ]; then
318+
ui_print "- Handle partition /$1"
319+
# we create a symlink if module want to access $MODPATH/system/$1
320+
# but it doesn't always work(ie. write it in post-fs-data.sh would fail because it is readonly)
321+
mv -f $MODPATH/system/$1 $MODPATH/$1 && ln -sf ../$1 $MODPATH/system/$1
322+
>>>>>>> parent of fd6f839d (ksud/installer: /odm handling (#2513))
315323
fi
316324
}
317325

@@ -406,6 +414,13 @@ install_module() {
406414
mark_remove "$MODPATH$TARGET"
407415
done
408416

417+
<<<<<<< HEAD
418+
=======
419+
handle_partition vendor
420+
handle_partition system_ext
421+
handle_partition product
422+
423+
>>>>>>> parent of fd6f839d (ksud/installer: /odm handling (#2513))
409424
if $BOOTMODE; then
410425
mktouch $NVBASE/modules/$MODID/update
411426
rm -rf $NVBASE/modules/$MODID/remove 2>/dev/null

0 commit comments

Comments
 (0)