| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 description "Run the window manager for the given logged in user" | 5 description "Run the window manager for the given logged in user" |
| 6 author "chromium-os-dev@chromium.org" | 6 author "chromium-os-dev@chromium.org" |
| 7 | 7 |
| 8 # start-user-session is only emitted from the new session_manager code. | 8 # start-user-session is only emitted from the new session_manager code. |
| 9 # chromeos-xsession (the old way of starting the WM) is not run on that | 9 # chromeos-xsession (the old way of starting the WM) is not run on that |
| 10 # code pathway. | 10 # code pathway. |
| 11 start on start-user-session | 11 start on start-user-session |
| 12 stop on stopping ui | 12 stop on stopping ui |
| 13 | 13 |
| 14 # sadly, these can't reference each other. | 14 # sadly, these can't reference each other. |
| 15 env DATA_DIR=/home/chronos | 15 env DATA_DIR=/home/chronos |
| 16 env HOME=/home/chronos/user | 16 env HOME=/home/chronos/user |
| 17 env XAUTHORITY=/home/chronos/.Xauthority | 17 env XAUTHORITY=/home/chronos/.Xauthority |
| 18 env DISPLAY=:0.0 | 18 env DISPLAY=:0.0 |
| 19 | 19 |
| 20 # might be overridden by --uid parameter in /sbin/session_manager_setup.sh | 20 # might be overridden by --uid parameter in /sbin/session_manager_setup.sh |
| 21 env USER_ID=1000 | 21 env USER_ID=1000 |
| 22 | 22 |
| 23 env PULSE_RUNTIME_PATH=/var/run/pulse |
| 24 |
| 23 respawn | 25 respawn |
| 24 script | 26 script |
| 25 | 27 |
| 26 WM="/usr/bin/chromeos-wm" | 28 WM="/usr/bin/chromeos-wm" |
| 27 IMAGES="/usr/share/chromeos-assets/images" | 29 IMAGES="/usr/share/chromeos-assets/images" |
| 28 BACKGROUND_FILE="background_1024x600.png" | 30 BACKGROUND_FILE="background_1024x600.png" |
| 29 BACKGROUND="${IMAGES}/${BACKGROUND_FILE}" | 31 BACKGROUND="${IMAGES}/${BACKGROUND_FILE}" |
| 30 LOG_DIR="${HOME}/log" | 32 LOG_DIR="${HOME}/log" |
| 31 XTERM_COMMAND="/usr/bin/xterm -bg black -fg grey +sb" | 33 XTERM_COMMAND="/usr/bin/xterm -bg black -fg grey +sb" |
| 32 | 34 |
| 33 cd ${HOME} | 35 cd ${HOME} |
| 34 exec /sbin/minijail --uid=${USER_ID} -- \ | 36 exec /sbin/minijail --uid=${USER_ID} -- \ |
| 35 "${WM}" \ | 37 "${WM}" \ |
| 36 --hotkey_overlay_image_dir="${IMAGES}" \ | 38 --hotkey_overlay_image_dir="${IMAGES}" \ |
| 37 --lm_overview_gradient_image="${IMAGES}/window_overview_gradient.png" \ | 39 --lm_overview_gradient_image="${IMAGES}/window_overview_gradient.png" \ |
| 38 --log_dir="${LOG_DIR}" \ | 40 --log_dir="${LOG_DIR}" \ |
| 39 --panel_anchor_image="${IMAGES}/panel_anchor.png" \ | 41 --panel_anchor_image="${IMAGES}/panel_anchor.png" \ |
| 40 --panel_dock_background_image="${IMAGES}/panel_dock_bg.png" \ | 42 --panel_dock_background_image="${IMAGES}/panel_dock_bg.png" \ |
| 41 --shadow_image_dir="${IMAGES}" \ | 43 --shadow_image_dir="${IMAGES}" \ |
| 42 --wm_background_image="${BACKGROUND}" \ | 44 --wm_background_image="${BACKGROUND}" \ |
| 43 --wm_xterm_command="${XTERM_COMMAND}" | 45 --wm_xterm_command="${XTERM_COMMAND}" |
| 44 end script | 46 end script |
| OLD | NEW |