Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3591c2a6 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

fs_mgr: adb-remount-test.sh report kernel version of device 



Report kernel version as part of the report.  Also warn user that
they are waiting for the screen to come up, and if the delay is
far too long, or the device is headless, then consider using the
--no-wait-screen option

Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Test: adb-remount-test.sh
Bug: ????
Change-Id: I68d1757da62d028dc3633b1175b06af19e469d9f
parent 12815501

fs_mgr/tests/adb-remount-test.sh

+7 −1
Original line number Original line Diff line number Diff line
@@ -861,13 +861,16 @@ fi 
BUILD_DESCRIPTION=`get_property ro.build.description`

BUILD_DESCRIPTION=`get_property ro.build.description`

[ -z "${BUILD_DESCRIPTION}" ] ||

[ -z "${BUILD_DESCRIPTION}" ] ||

  echo "${BLUE}[     INFO ]${NORMAL} ${BUILD_DESCRIPTION}" >&2

  echo "${BLUE}[     INFO ]${NORMAL} ${BUILD_DESCRIPTION}" >&2

KERNEL_VERSION="`adb_su cat /proc/version </dev/null 2>/dev/null`"

[ -z "${KERNEL_VERSION}" ] ||

  echo "${BLUE}[     INFO ]${NORMAL} ${KERNEL_VERSION}" >&2

ACTIVE_SLOT=`get_active_slot`

ACTIVE_SLOT=`get_active_slot`

[ -z "${ACTIVE_SLOT}" ] ||

[ -z "${ACTIVE_SLOT}" ] ||

  echo "${BLUE}[     INFO ]${NORMAL} active slot is ${ACTIVE_SLOT}" >&2

  echo "${BLUE}[     INFO ]${NORMAL} active slot is ${ACTIVE_SLOT}" >&2





# Acquire list of system partitions

# Acquire list of system partitions





PARTITIONS=`adb_su cat /vendor/etc/fstab* |

PARTITIONS=`adb_su cat /vendor/etc/fstab* </dev/null |

              skip_administrative_mounts |

              skip_administrative_mounts |

              sed -n "s@^\([^ ${TAB}/][^ ${TAB}/]*\)[ ${TAB}].*[, ${TAB}]ro[, ${TAB}].*@\1@p" |

              sed -n "s@^\([^ ${TAB}/][^ ${TAB}/]*\)[ ${TAB}].*[, ${TAB}]ro[, ${TAB}].*@\1@p" |

              sort -u |

              sort -u |
@@ -904,6 +907,9 @@ adb_sh ls -l /dev/block/by-name/ /dev/block/mapper/ </dev/null 2>/dev/null | 
  done

  done





# If reboot too soon after fresh flash, could trip device update failure logic

# If reboot too soon after fresh flash, could trip device update failure logic

if ${screen_wait}; then

  echo "${ORANGE}[  WARNING ]${NORMAL} waiting for screen to come up. Consider --no-wait-screen option" >&2

fi

if ! wait_for_screen && ${screen_wait}; then

if ! wait_for_screen && ${screen_wait}; then

  screen_wait=false

  screen_wait=false

  echo "${ORANGE}[  WARNING ]${NORMAL} not healthy, no launcher, skipping wait for screen" >&2

  echo "${ORANGE}[  WARNING ]${NORMAL} not healthy, no launcher, skipping wait for screen" >&2