Merge pull request #3862 from dnschneid/versioncheck

Avoid letting crouton run inside crostini
dnschneid · Oct 1, 2018 · d982ebf · d982ebf
2 parents 5d4c301 + cee3616
commit d982ebf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -43,6 +43,28 @@ to the rest of Chromium OS.
 ...but hey, you can run [TuxRacer](https://en.wikipedia.org/wiki/Tux_Racer)!
 
 
+### What about dem crostinis though?
+
+[Crostini](https://chromium.googlesource.com/chromiumos/docs/+/master/containers_and_vms.md)
+is an official project within Chromium OS to bring the Linux shell and apps to
+the platform *in verified mode* with clean integration, multi-layered security,
+and all the polish you expect from Chromium OS proper.
+
+That means compared to crouton, Crostini has official support, competent
+engineers, and code that looks a little less like ramen.  crouton, in its
+defense, has wider device compatibility, enables direct hardware access, and is
+named after an objectively tastier bread-based food item.
+
+There's a solid community on [Reddit](https://www.reddit.com/r/Crostini/) if
+you'd like to try Crostini out.  If it works for you -- great!  No hard
+feelings.  If in the end you decide that crouton suits you better, read on!
+
+Note: you can't get the best of both worlds by installing crouton inside of
+Crostini.  The technology (and life itself) just doesn't work that way.  Not to
+mention a crouton Crostini would look ridiculous and be impossible to eat
+without getting bits everywhere.
+
+
 ## Prerequisites
 
 You need a device running Chromium OS that has been switched to developer mode.

diff --git a/installer/main.sh b/installer/main.sh
@@ -138,12 +138,16 @@ done
 shift "$((OPTIND-1))"
 
 # Check against the minimum version of Chromium OS
-if ! awk -F= '/_RELEASE_BUILD_NUMBER=/ { exit int($2) < '"${CROS_MIN_VERS:-0}"' }' \
+if [ -n "$DOWNLOADONLY" ]; then
+    :
+elif ! grep -q '_RELEASE_BUILD_NUMBER=' /etc/lsb-release 2>/dev/null; then
+    error 2 "$APPLICATION can only be installed in the Chromium OS dev mode shell."
+elif ! awk -F= '/_RELEASE_BUILD_NUMBER=/ { exit int($2) < '"${CROS_MIN_VERS:-0}"' }' \
         '/etc/lsb-release' 2>/dev/null; then
     error 2 "Your version of Chromium OS is extraordinarily old.
 If there are updates pending, please reboot and try again.
 Otherwise, you may not be getting automatic updates, in which case you should
-post your update_engine.log from chrome://system to http://crbug.com/296768 and
+post your update_engine.log from chrome://system to http://crbug.com/new and
 restore your device using a recovery USB: https://goo.gl/AZ74hj"
 fi