Drinkcat separate partition Re-base to latest dnschneid/crouton

.gitignore

@@ -1,6 +1,7 @@
 *.tar.*
 .*.swp
 .*.tmp
+nacl_sdk/
 /crouton*
 /tests/run
 /releases/

CONTRIBUTING.md

@@ -0,0 +1,9 @@
+##For users who want to report an issue
+Please read [this wiki page]
+(https://github.com/dnschneid/crouton/wiki/Common-issues-and-reporting)
+for instructions on reporting an issue.
+
+##For contributors
+Please read [this
+section](https://github.com/dnschneid/crouton#i-want-to-be-a-contributor)
+of the README and the following relevant sections first.

CONTRIBUTORS

@@ -12,9 +12,12 @@ John Tantalo
 Maurice van Kruchten
 Micah Lee
 Michael Orr
+Mike Kasick
+Mikito Takada
 Nevada Romsdahl
 Nicolas Boichat
 Stephen Barber
 Steven Maude
 Tobbe Lundberg
+Tony Xue
 Yuri Pole

Makefile

@@ -15,17 +15,26 @@ SCRIPTS := \
 	$(wildcard installer/*/*) \
 	$(wildcard src/*) \
 	$(wildcard targets/*)
+EXTPEXE = host-ext/crouton/kiwi.pexe
+EXTPEXESOURCES = $(wildcard host-ext/nacl_src/*.h) \
+				 $(wildcard host-ext/nacl_src/*.cc)
 EXTSOURCES = $(wildcard host-ext/crouton/*)
 GENVERSION = build/genversion.sh
 CONTRIBUTORSSED = build/CONTRIBUTORS.sed
 RELEASE = build/release.sh
 VERSION = 1
 TARPARAMS ?= -j
 
+CFLAGS=-g -Wall -Werror -Os
+
 croutoncursor_LIBS = -lX11 -lXfixes -lXrender
+croutonfbserver_LIBS = -lX11 -lXdamage -lXext -lXfixes -lXtst
 croutonwmtools_LIBS = -lX11
 croutonxi2event_LIBS = -lX11 -lXi
 
+croutonwebsocket_DEPS = src/websocket.h
+croutonfbserver_DEPS = src/websocket.h
+
 ifeq ($(wildcard .git/HEAD),)
     GITHEAD :=
 else
@@ -50,8 +59,17 @@ $(TARGET): $(WRAPPER) $(SCRIPTS) $(GENVERSION) $(GITHEAD) Makefile
 $(EXTTARGET): $(EXTSOURCES) Makefile
 	rm -f $(EXTTARGET) && zip -q --junk-paths $(EXTTARGET) $(EXTSOURCES)
 
-$(SRCTARGETS): src/$(patsubst crouton%,src/%.c,$@) Makefile
-	gcc -g -Wall -Werror $(patsubst crouton%,src/%.c,$@) $($@_LIBS) -o $@
+$(EXTPEXE): $(EXTPEXESOURCES)
+	$(MAKE) -C host-ext/nacl_src
+
+$(SRCTARGETS): src/$(patsubst crouton%,src/%.c,$@) $($@_DEPS) Makefile
+	gcc $(CFLAGS) $(patsubst crouton%,src/%.c,$@) $($@_LIBS) -o $@
+
+croutonfreon.so: src/freon.c Makefile
+	gcc $(CFLAGS) -shared -fPIC src/freon.c -ldl -o croutonfreon.so
+
+croutonxorg.so: src/xorg.c Makefile
+	gcc $(CFLAGS) -shared -fPIC src/xorg.c -ldl -o croutonxorg.so
 
 extension: $(EXTTARGET)
 

README.md

@@ -47,11 +47,21 @@ to the rest of Chromium OS.
 Prerequisites
 -------------
 You need a device running Chromium OS that has been switched to developer mode.
+
+For instructions on how to do that, go to [this Chromium OS wiki page]
+(http://www.chromium.org/chromium-os/developer-information-for-chrome-os-devices),
+click on your device model and follow the steps in the *Entering Developer Mode*
+section.
+
 Note that developer mode, in its default configuration, is *completely
 insecure*, so don't expect a password in your chroot to keep anyone from your
 data. crouton does support encrypting chroots, but the encryption is only as
 strong as the quality of your passphrase. Consider this your warning.
 
+It's also highly recommended that you install the [crouton extension]
+(https://goo.gl/OVQOEt), which, when combined with the `extension` or `xiwi`
+targets, provides much improved integration with Chromium OS.
+
 That's it! Surprised?
 
 
@@ -99,7 +109,8 @@ Examples
   6. Exit the chroot by logging out of Xfce.
 
 ### With encryption!
-  1. Add the `-e` parameter when you run crouton to create an encrypted chroot.
+  1. Add the `-e` parameter when you run crouton to create an encrypted chroot
+     or encrypt a non-encrypted chroot.
   2. You can get some extra protection on your chroot by storing the decryption
      key separately from the place the chroot is stored. Use the `-k` parameter
      to specify a file or directory to store the keys in (such as a USB drive or
@@ -111,22 +122,31 @@ Examples
   2. Run `sh ~/Downloads/crouton -r list` to list the recognized releases and
      which distros they belong to.
 
+### Wasteful rendundancies are wasteful: one clipboard, one browser, one window
+  1. Install the [crouton extension](https://goo.gl/OVQOEt) into Chromium OS.
+  2. Add the `extension` or `xiwi` version to your chroot.
+  3. Try some copy-pasta, or uninstall all your web browsers from the chroot.
+
+*Installing the extension and its target gives you synchronized clipboards, the
+option of using Chromium OS to handle URLs, and allows chroots to create
+graphical sessions as Chromium OS windows.*
+
 ### I don't always use Linux, but when I do, I use CLI
   1. You can save a chunk of space by ditching X and just installing
      command-line tools using `-t core` or `-t cli-extra`
   2. Enter the chroot in as many crosh shells as you want simultaneously using
      `sudo enter-chroot`
   3. Use the [Crosh Window](https://goo.gl/eczLT) extension to keep Chromium OS
      from eating standard keyboard shortcuts.
+  4. If you installed cli-extra, `startcli` will launch a new VT right into the
+     chroot.
 
 ### A new version of crouton came out; my chroot is therefore obsolete and sad
   1. Check for updates, download the latest version, and see what's new by
      running `croutonversion -u -d -c` from the chroot (run `croutonversion -h`
      to see what those parameters actually do).
   2. Exit the chroot and run `sudo sh ~/Downloads/crouton -u -n chrootname`.
      It will update all installed targets.
-  3. You can use this with `-e` to encrypt a non-encrypted chroot, but make sure
-     you don't interrupt the operation.
 
 ### A backup a day keeps the price-gouging data restoration services away
   1. `sudo edit-chroot -b chrootname` backs up your chroot to a timestamped
@@ -160,7 +180,8 @@ Examples
   3. Include the `-r` parameter if you want to specify for which release to
      prepare a bootstrap.
   4. You can then create chroots using the tarball by running
-     `sudo sh ~/Downloads/crouton -f ~/Downloads/mybootstrap.tar.bz2`
+     `sudo sh ~/Downloads/crouton -f ~/Downloads/mybootstrap.tar.bz2`. Make sure 
+      you also specify the target environment with `-t`.
 
 *This is the quickest way to create multiple chroots at once, since you won't
 have to determine and download the bootstrap files every time.*
@@ -184,7 +205,7 @@ Tips
   * Chroots are cheap! Create multiple ones using `-n`, break them, then make
     new, better ones!
   * You can change the distro mirror from the default by using `-m`
-  * Behind a proxy? `-P` lets you specify one.
+  * Want to use a proxy? `-P` lets you specify one (or disable it).
   * A script is installed in your chroot called `brightness`. You can assign
     this to keyboard shortcuts to adjust the brightness of the screen (e.g.
     `brightness up`) or keyboard (e.g. `brightness k down`).
@@ -198,6 +219,8 @@ Tips
     `croutonpowerd -i command and arguments` will automatically stop inhibiting
     power management when the command exits.
   * Have a Pixel or two or 4.352 million? `-t touch` improves touch support.
+  * Want to share some files and/or folders between ChromeOS and your chroot?  
+    Check out the `/etc/crouton/shares` file, or read all about it in the wiki. 
   * Want more tips? Check the [wiki](https://github.com/dnschneid/crouton/wiki).
 
 
@@ -207,13 +230,14 @@ Running another OS in a chroot is a pretty messy technique (although it's hidden
 behind very pretty scripts), and these scripts are relatively new, so problems
 are not surprising. Check the issue tracker and file a bug if your issue isn't
 there. When filing a new bug, include the output of `croutonversion` run from
-inside the chroot (if possible).
+inside the chroot or, if you cannot mount your chroot, include the output
+of `cat /etc/lsb-release` from Crosh.
 
 
 I want to be a Contributor!
 ---------------------------
 That's great!  But before your code can be merged, you'll need to have signed
-the [Individual Contributor License Agreement](https://developers.google.com/open-source/cla/individual#sign-electronically).
+the [Individual Contributor License Agreement](https://cla.developers.google.com/clas/new?kind=KIND_INDIVIDUAL&domain=DOMAIN_GOOGLE).
 Don't worry, it only takes a minute and you'll definitely get to keep your
 firstborn, probably.  If you've already signed it for contributing to Chromium
 or Chromium OS, you're already done.
@@ -243,7 +267,8 @@ But how?
 There's a way For Everyone to help!
 
   * Something broken? File a bug! Bonus points if you try to fix it. It helps if
-    you provide the output of `croutonversion` when you submit the bug.
+    you provide the output of `croutonversion` (or the output of
+    `cat /etc/lsb-release` from Crosh) when you submit the bug.
   * Want to try and break something? Look through [requests for testing](https://github.com/dnschneid/crouton/issues?labels=needstesting&state=open)
     and then do your best to brutally rip the author's work to shreds.
   * Look through [open issues](https://github.com/dnschneid/crouton/issues?state=open)

build/wrapper.sh

@@ -38,8 +38,8 @@ set -e
 
 VERSION='git'
 
-# Minimum Chromium OS version is R31 stable
-CROS_MIN_VERS=4731
+# Minimum Chromium OS version is R35 stable
+CROS_MIN_VERS=5712
 
 if [ "$1" = '-x' -a "$#" -le 2 ]; then
     # Extract to the specified directory.
@@ -62,6 +62,33 @@ if [ -z "$TRAP" ]; then
     exit
 fi
 
+# See if we want to just run a script from the bundle
+if [ "$1" = '-X' ]; then
+    script="$SCRIPTDIR/$2"
+    if [ ! -f "$script" ]; then
+        cd "$SCRIPTDIR"
+        echo "USAGE: ${0##*/} -X DIR/SCRIPT [ARGS]
+Runs a script directly from the bundle. Valid DIR/SCRIPT combos:" 1>&2
+        ls chroot-bin/* host-bin/* 1>&2
+        if [ -n "$2" ]; then
+            echo 1>&2
+            echo "Invalid script '$2'" 1>&2
+        fi
+        exit 2
+    fi
+    shift 2
+    # If this script was called with '-x' or '-v', pass that on
+    SETOPTIONS="-e"
+    if set -o | grep -q '^xtrace.*on$'; then
+        SETOPTIONS="$SETOPTIONS -x"
+    fi
+    if set -o | grep -q '^verbose.*on$'; then
+        SETOPTIONS="$SETOPTIONS -v"
+    fi
+    sh $SETOPTIONS "$script" "$@"
+    exit "$?"
+fi
+
 # Execute the main script inline. It will use SCRIPTDIR to find what it needs.
 . "$SCRIPTDIR/installer/main.sh"
 

chroot-bin/crouton-noroot

@@ -0,0 +1,32 @@
+#!/bin/sh -e
+# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Wrapper for scripts that shouldn't be launched as root.
+# Symlink to launch the application with the same name in /usr/bin/
+# Launch directly with a parameter to launch that executable
+# Launch directly with a blank or - first parameter and a word to just check and
+# exit with an exit code, printing out the second parameter as the app name.
+
+APPLICATION="${0##*/}"
+if [ "$APPLICATION" = 'crouton-noroot' ]; then
+    if [ -z "$1" -o "$1" = '-' -o "$1" = '--' ]; then
+        APPLICATION=''
+    else
+        APPLICATION="$1"
+        shift
+    fi
+else
+    APPLICATION="/usr/bin/$APPLICATION"
+fi
+
+if [ "$USER" = root -o "$UID" = 0 ]; then
+    app="${APPLICATION:-"$2"}"
+    echo "Do not launch ${app##*/} as root inside the chroot." 1>&2
+    exit 2
+elif [ -z "$APPLICATION" ]; then
+    exit 0
+fi
+
+exec "$APPLICATION" "$@"

chroot-bin/croutonclip

@@ -10,36 +10,18 @@ VERBOSE=''
 
 . "`dirname "$0"`/../installer/functions"
 
-PIPEDIR='/tmp/crouton-ext'
-PIPEIN="$PIPEDIR/in"
-PIPEOUT="$PIPEDIR/out"
-PIPELOCK="$PIPEDIR/lock"
-
-# Write a command to croutonwebsocket, and read back response
-websocketcommand() {
-    # Check that $PIPEDIR and the FIFO pipes exist
-    if ! [ -d "$PIPEDIR" -a -p "$PIPEIN" -a -p "$PIPEOUT" ]; then
-        echo "EError $PIPEIN or $PIPEOUT are not pipes."
-        exit 0
-    fi
-
-    (
-        flock 5
-        cat > "$PIPEIN"
-        cat "$PIPEOUT"
-    ) 5>"$PIPELOCK"
-}
-
 # rundisplay :X cmd ...
-# Run a command on the specified display (uses host-x11 on :0)
+# Run a command on the specified display
 rundisplay() {
     local disp="$1"
     shift
-    if [ "$disp" = ":0" ]; then
-        host-x11 "$@"
-    else
+    (
+        # If display is :0, setup XAUTHORITY
+        if [ "$disp" = ":0" ]; then
+            eval "`host-x11`" 2>/dev/null
+        fi
         DISPLAY="$disp" "$@"
-    fi
+    )
 }
 
 copyclip() {
@@ -60,7 +42,7 @@ copyclip() {
 
     # Copy clipboard content from the current display
     {
-        if [ "$current" = 'aura' ]; then
+        if [ "$current" = 'cros' ]; then
             echo -n 'R' | websocketcommand
         else
             # Check if display is still running
@@ -81,7 +63,7 @@ copyclip() {
         fi
 
         # Paste clipboard content to the next display
-        if [ "$next" = 'aura' ]; then
+        if [ "$next" = 'cros' ]; then
             STATUS="`(echo -n 'W'; cat) | websocketcommand`"
             if [ "$STATUS" != 'WOK' ]; then
                 # Write failed, skip Chromium OS (do not update $current)
@@ -138,19 +120,16 @@ waitwebsocket() {
 
 # Assume current display is Chromium OS: avoid race as we may not be able to
 # detect the first VT/window change.
-current='aura'
-
-# Only let one instance *really* run at a time
-PIDFILE='/tmp/crouton-lock/clip'
+current='cros'
 
-mkdir -m 775 -p /tmp/crouton-lock
-exec 3>>"$PIDFILE"
+mkdir -m 775 -p "$CROUTONLOCKDIR"
+exec 3>>"$CROUTONLOCKDIR/clip"
 if ! flock -n 3; then
     echo "Another instance of croutonclip running, waiting..."
     flock 3
 fi
 
-addtrap "echo -n > '$PIDFILE' 2>/dev/null"
+addtrap "echo -n > '$CROUTONLOCKDIR/clip' 2>/dev/null"
 
 (
     # This subshell handles USR1 signals from croutoncycle.
@@ -172,7 +151,7 @@ addtrap "echo -n > '$PIDFILE' 2>/dev/null"
     trap "echo 'USR1'" USR1
 
     # Set the PID of this subshell after the trap is in place
-    sh -c 'echo -n "$PPID"' > "$PIDFILE"
+    sh -c 'echo -n "$PPID"' > "$CROUTONLOCKDIR/clip"
 
     # Force an update when started.
     echo "Force"