adb-remount-test.sh: Make devt errors warnings instead
OverlayFS on Device Mapper on Dynamic Partition / Split Fiemap doesn't seem to report stable dev_t values of the underlying "wrapped" device. For example, when not using overlayFS, the dev_t of a file in /system may be something like 253:8, a dm-verity wrapped device (253 is device mapper's major id). When overlayFS is enabled, the /system mount point is mounted with a overlayFS device wrapping a dm-linear device wrapping the actual storage device. In this case, stat-ing a file in /system shows the dev_t to be something like 0:23. Not only is the major id not correct, the minor id is not stable across reboots, too. For now, suppress the error and make it a warning so it don't report false negatives. We may want to turn this check back on if the overlayfs driver is fixed of this issue. Bug: 165925766 Test: adb-remount-test.sh Change-Id: I035caec3e00d179f227850cbc9835fb3aedf88e5
This commit is contained in:
parent
346e6792b4
commit
debd95385f
|
@ -1380,9 +1380,9 @@ check_eq "${SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/hello </dev/null`" s
|
|||
check_eq "${VENDOR_DEVT}" "`adb_sh stat --format=%D /vendor/hello </dev/null`" vendor devt after reboot
|
||||
check_eq "${SYSTEM_INO}" "`adb_sh stat --format=%i /system/hello </dev/null`" system inode after reboot
|
||||
check_eq "${VENDOR_INO}" "`adb_sh stat --format=%i /vendor/hello </dev/null`" vendor inode after reboot
|
||||
check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/bin/stat </dev/null`" base system devt after reboot
|
||||
check_eq "${BASE_VENDOR_DEVT}" "`adb_sh stat --format=%D /vendor/bin/stat </dev/null`" base system devt after reboot
|
||||
check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/xbin/su </dev/null`" devt for su after reboot
|
||||
check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/bin/stat </dev/null`" --warning base system devt after reboot
|
||||
check_eq "${BASE_VENDOR_DEVT}" "`adb_sh stat --format=%D /vendor/bin/stat </dev/null`" --warning base vendor devt after reboot
|
||||
check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/xbin/su </dev/null`" --warning devt for su after reboot
|
||||
|
||||
# Feed log with selinux denials as a result of overlays
|
||||
adb_sh find ${MOUNTS} </dev/null >/dev/null 2>/dev/null
|
||||
|
@ -1509,8 +1509,8 @@ else
|
|||
|
||||
check_eq "${SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/hello </dev/null`" system devt after reboot
|
||||
check_eq "${SYSTEM_INO}" "`adb_sh stat --format=%i /system/hello </dev/null`" system inode after reboot
|
||||
check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/bin/stat </dev/null`" base system devt after reboot
|
||||
check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/xbin/su </dev/null`" devt for su after reboot
|
||||
check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/bin/stat </dev/null`" --warning base system devt after reboot
|
||||
check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/xbin/su </dev/null`" --warning devt for su after reboot
|
||||
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue