← Back to branch summary

~mzanetti/unity8/fix-1648251

« back to all changes in this revision

Viewing changes to data/unity8-greeter-wrapper

  • Committer: Michael Zanetti
  • Date: 2016-12-01 12:20:34 UTC
  • mfrom: (2525.1.179 unity8)
  • Revision ID: michael.zanetti@canonical.com-20161201122034-cpvbf7webbhg2wph
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/unity8-greeter-wrapper
45
45
 
46
46
# If touch session script (which sets up grid units and mir variables) is available, use it
47
47
TOUCH_WRAPPER=
48
 
if [ -x /usr/bin/ubuntu-touch-session ]; then
49
 
    TOUCH_WRAPPER=/usr/bin/ubuntu-touch-session
 
48
if which ubuntu-touch-session >/dev/null; then
 
49
    TOUCH_WRAPPER=ubuntu-touch-session
50
50
fi
51
51
 
52
52
# Pretend that we're in an ubuntu-touch session, so that indicator-network
63
63
# creates for them and don't want to start all the services that a normal
64
64
# session would.  So it's inconvenient to live within an upstart session.
65
65
# But... we still want to use Upstart for some services.  So launch here.
66
 
MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &
 
66
MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER upstart --user --no-startup-event &
67
67
INIT_PID=$!
68
68
while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
69
69
. "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session"
72
72
# Connect upstart to system, but do first command in a loop to avoid any
73
73
# race condition between the session file above being written and upstart being
74
74
# ready to handle requests.
75
 
while ! /sbin/initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done
76
 
/sbin/initctl start notify-cgmanager
 
75
while ! initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done
 
76
initctl start notify-cgmanager
77
77
 
78
78
# Start any pre-greeter tasks if needed (like wizard)
79
 
/sbin/initctl emit unity8-greeter-starting
 
79
initctl emit unity8-greeter-starting
80
80
 
81
81
# Define language here for phone if available.  When phone user switches their
82
82
# language, they expect that to affect the greeter too.  But the user doesn't