Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(985)

Unified Diff: src/platform/init/chromeos_startup

Issue 2081018: fix for issue 2610: (Closed) Base URL: ssh://git@chromiumos-git/chromeos
Patch Set: s/mod_image/image_type/ Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/platform/recovery_installer/recovery_install.conf » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform/init/chromeos_startup
diff --git a/src/platform/init/chromeos_startup b/src/platform/init/chromeos_startup
index a17e6cde1f8d693e2e693e46f4f34fed864ce81d..00e75954de526a11976cf8b3d30dfc88c1a39b6f 100755
--- a/src/platform/init/chromeos_startup
+++ b/src/platform/init/chromeos_startup
@@ -25,7 +25,8 @@ cp -a -f /lib/chromiumos/devices/* /dev
# Splash screen! Unless we are in noninteractive mode.
# TODO(sosa@chromium.org) - Use kernel flag
if [ -x /usr/bin/ply-image ]; then
- if [ ! -f /root/.factory_test ] && [ ! -f /root/.factory_installer ]; then
+ if [ ! -f /root/.factory_test ] && [ ! -f /root/.factory_installer ] && \
+ [ ! -f /root/.recovery_installer ]; then
# Moblin trick: Disable blinking cursor. Without this a splash screen
# will show a distinct cursor shape even when the cursor is set to none.
echo 0 > /sys/devices/virtual/graphics/fbcon/cursor_blink
@@ -46,8 +47,9 @@ if [ "$ROOT_DEV" = "/dev/dm-0" ]; then
fi
STATE_DEV=${ROOT_DEV%[0-9]*}1
-# For factory install shim, we never want to write to the SDCard.
-if [ -f /root/.factory_installer ]; then
+# For factory install shim and recovery image, we never want to write to
+# the SDCard.
+if [ -f /root/.factory_installer ] || [ -f /root/.recovery_installer ]; then
mount -n -t tmpfs tmp /mnt/stateful_partition
else
mount -n -t ext3 "$STATE_DEV" /mnt/stateful_partition
« no previous file with comments | « no previous file | src/platform/recovery_installer/recovery_install.conf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698