| commit | c7d17597c6554ffe0ca648cea63045a4a19b2aba | [log] [tgz] |
|---|---|---|
| author | Michael H Yang <michael.h.yang@intel.com> | Fri Jul 17 17:53:40 2015 +0800 |
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | Wed Jul 22 07:43:31 2015 +0000 |
| tree | bcadf78ecf478a32aef2c1ee11c6639d24dc657e | |
| parent | db01f1a20dbab623faf5fb5cb91871051f07a21f [diff] |
CHERRY-PICK: Lulu: Move board_charge_battery to battery_cut_off.sh Per OEM's request, we will need the battery capacity check in factory but not in RMA center. So, we move the board_charge_battery from board_factory_reset.sh to battery_cut_off.sh. In that case, we can use battery_cut_off as wipe_option in normal factory process and use rma_battery_cut_off as wipe_option for making RMA shim. BUG=chrome-os-partner:40510 TEST=Factory wipe and check the different wipe option behavior Original-Change-Id: I8967b937160a1791ba69618010f4ee106732d62e Change-Id: I8b5d567f5ccad560add36d898e242a3d752a9343 Reviewed-on: https://chromium-review.googlesource.com/287050 Reviewed-by: Bowgo Tsai <bowgotsai@chromium.org> Commit-Queue: Michael H Yang <michael.h.yang@intel.com> Tested-by: Michael H Yang <michael.h.yang@intel.com>
diff --git a/overlay-lulu/chromeos-base/chromeos-bsp-lulu/chromeos-bsp-lulu-0.0.1-r12.ebuild b/overlay-lulu/chromeos-base/chromeos-bsp-lulu/chromeos-bsp-lulu-0.0.1-r13.ebuild similarity index 100% rename from overlay-lulu/chromeos-base/chromeos-bsp-lulu/chromeos-bsp-lulu-0.0.1-r12.ebuild rename to overlay-lulu/chromeos-base/chromeos-bsp-lulu/chromeos-bsp-lulu-0.0.1-r13.ebuild
diff --git a/overlay-lulu/chromeos-base/chromeos-bsp-lulu/files/sbin/battery_cut_off.sh b/overlay-lulu/chromeos-base/chromeos-bsp-lulu/files/sbin/battery_cut_off.sh index 472ef66..eaaacc4 100755 --- a/overlay-lulu/chromeos-base/chromeos-bsp-lulu/files/sbin/battery_cut_off.sh +++ b/overlay-lulu/chromeos-base/chromeos-bsp-lulu/files/sbin/battery_cut_off.sh
@@ -9,6 +9,8 @@ DISPLAY_MESSAGE="/usr/sbin/display_wipe_message.sh" +/usr/sbin/board_charge_battery.sh + modprobe i2c_dev if (ectool battery | grep -q AC_PRESENT); then "${DISPLAY_MESSAGE}" "remove_ac"
diff --git a/overlay-lulu/chromeos-base/chromeos-bsp-lulu/files/sbin/board_factory_reset.sh b/overlay-lulu/chromeos-base/chromeos-bsp-lulu/files/sbin/board_factory_reset.sh index 39c98e2..8ca3176 100644 --- a/overlay-lulu/chromeos-base/chromeos-bsp-lulu/files/sbin/board_factory_reset.sh +++ b/overlay-lulu/chromeos-base/chromeos-bsp-lulu/files/sbin/board_factory_reset.sh
@@ -13,8 +13,6 @@ sync sleep 3 -/usr/sbin/board_charge_battery.sh - /usr/sbin/battery_cut_off.sh # Battery cut-off is failed if it returns with 1.