Google Git
Sign in
cos / mirrors / cros / chromiumos / platform / crosutils / 5ce240668d60ad521aafd8f30f4fc2c78abbd174
commit5ce240668d60ad521aafd8f30f4fc2c78abbd174[log] [tgz]
authorVincent Palatin <vpalatin@chromium.org>Wed Feb 26 12:08:23 2014 -0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>Fri Feb 28 22:45:27 2014 +0000
tree10893fee3f1895ead1cccad756749d9f96b55ce7
parent7528b32a48fb2c5a16802da2bb6eccda90f8290c [diff]
support installing Chromium OS chroot in another chroot

The detection of whether we are inside the Chromium OS build chroot is
making a false positive when run inside Crouton which is itself a
Ubuntu chroot.
Let's filter out all Debian derivative chroot and check only for a
genuine Chromium OS chroot.

BUG=none
TEST=on Pixel in dev mode, run cros_sdk in the Crouton chroot.
CQ-DEPEND=I3c143e85c141e2def038fb859c90bea7003fc875

Change-Id: I723fc57805d3891d00a111547f9aaa33231aa9ea
Reviewed-on: https://chromium-review.googlesource.com/188071
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
3 files changed
tree: 10893fee3f1895ead1cccad756749d9f96b55ce7
  1. bin/
  2. build_library/
  3. chroot_version_hooks.d/
  4. hooks/
  5. lib/
  6. mod_for_dbusspy/
  7. mod_for_test_scripts/
  8. path-overrides/
  9. sdk_lib/
  10. chromeos-common.sh ⇨ ../platform/installer/chromeos-common.sh
  11. cros_run_unit_tests ⇨ ../platform/crostestutils/cros_run_unit_tests
  12. generate_test_report ⇨ ../platform/crostestutils/utils_py/generate_test_report.py
  13. image_to_live.sh ⇨ ../platform/dev/host/image_to_live.sh
  14. make_factory_package.sh ⇨ ../platform/factory/setup/make_factory_package.sh
  15. run_remote_tests.sh ⇨ ../platform/crostestutils/run_remote_tests.sh
  16. .gitignore
  17. archive_hwqual
  18. bash_completion
  19. build_image
  20. build_kernel_image.sh
  21. build_packages
  22. call_autoserv.py
  23. clean_loopback_devices
  24. common.sh
  25. cros_generate_stacks_bvt
  26. cros_show_stacks
  27. cros_workon
  28. enable_localaccount.sh
  29. exclude-list
  30. fwcontrol
  31. get_latest_image.sh
  32. get_package_list
  33. image_to_usb.sh
  34. image_to_vm.sh
  35. install_toolchain
  36. make_factory_toolkit.sh
  37. make_netboot.sh
  38. mod_image_for_recovery.sh
  39. mod_test_image_for_dbusspy.sh
  40. mod_test_image_for_pyauto.sh
  41. mount_gpt_image.sh
  42. package_dependency_list.sh
  43. package_dependency_runtime_stats.sh
  44. PRESUBMIT.cfg
  45. python_cleaner
  46. remote_access.sh
  47. run_chroot_version_hooks
  48. security_test_image
  49. serve_factory_packages.py
  50. set_shared_user_password.sh
  51. setup_board
  52. sha256_partitions.sh
  53. ssh_test.sh
  54. start_devserver
  55. update_bootloaders.sh
  56. update_chroot
  57. update_kernel.sh
  58. verify_rootfs_chksum.sh