Issue 6708095: [0.11.257.B] Cherry pick crosh dev mode detection to R/M11.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Issue 6708095: [0.11.257.B] Cherry pick crosh dev mode detection to R/M11. (Closed)

Created:
9 years, 9 months ago by Will Drewry

Modified:
9 years, 7 months ago

Reviewers:
Chris Masone, Benson Leung

CC:
chromium-os-reviews_chromium.org, Greg Spencer (Chromium), Daniel Erat, Randall Spangler, puneetster

Base URL:
ssh://git@gitrw.chromium.org:9222/window_manager.git@0.11.257.B

Visibility:
Public.

Description

[0.11.257.B] Cherry pick crosh dev mode detection to R/M11. crosh: fix dev mode detection Migrate from cros_boot_mode to crossystem BUG=chrome-os-partner:2688 TEST=Ctrl+Alt+T in both dev and normal modes. shell only works in dev mode. Change-Id: I061885d9c6912fbe078e7e2d6b87733e8a5a50bc R=bleung@chromium.org,cmasone@chromium.org Review URL: http://codereview.chromium.org/6713073 (cherry picked from commit b7848fcfdf52960111a86ad413ea5ffe7be2f09f) Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=e96b162

Patch Set 1 #

Created: 9 years, 9 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+3 lines, -2 lines)			Patch
	M	bin/crosh	View		1 chunk	+3 lines, -2 lines	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

Chris Masone

9 years, 9 months ago (2011-03-22 18:52:24 UTC) #2

LGTM

On Tue, Mar 22, 2011 at 11:45 AM,  <wad@chromium.org> wrote:
> Reviewers: Benson Leung, Chris Masone,
>
> Message:
> Last one.. I think
>
> Description:
> [0.11.257.B] Cherry pick crosh dev mode detection to R/M11.
>
> crosh: fix dev mode detection
>
> Migrate from cros_boot_mode to crossystem
>
> BUG=chrome-os-partner:2688
> TEST=Ctrl+Alt+T in both dev and normal modes. shell only works in dev mode.
>
> Change-Id: I061885d9c6912fbe078e7e2d6b87733e8a5a50bc
>
> R=bleung@chromium.org,cmasone@chromium.org
>
> Review URL: http://codereview.chromium.org/6713073
> (cherry picked from commit b7848fcfdf52960111a86ad413ea5ffe7be2f09f)
>
>
> Please review this at http://codereview.chromium.org/6708095/
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/window_manager.git@0.11.257.B
>
> Affected files:
>  M bin/crosh
>
>
> Index: bin/crosh
> diff --git a/bin/crosh b/bin/crosh
> index
>
8fbffad84dac85428dcdc9801de7fe7205661e2e..6f05352dfe0af20027ce497673bedcfb5595154c
> 100755
> --- a/bin/crosh
> +++ b/bin/crosh
> @@ -114,10 +114,11 @@ if [ "$(echo "$@" | grep -- "--usb")" -o "$REMOVABLE"
> = "1" ]; then
>  fi
>
>  # TODO(rginda): Switch to the "real" dev mode file when we have one.
> -/bin/cros_boot_mode -s -m developer
> +/usr/bin/crossystem cros_debug?1
>  DEVMODE=$((!$?))
>  # Force dev behavior on dev images
> -# TODO(wad) replace with a cros_boot_mode arg once supported.
> +# TODO(wad,rspangler) replace with a crossystem arg once cros_debug checks
> this
> +# too.
>  if [ -f "/root/.dev_mode" ]; then
>   DEVMODE=1
>  fi
>
>
>

Expand Messages | Collapse Messages