← Back to branch summary

~andrea.corbellini/ubiquity/bug-531343

« back to all changes in this revision

Viewing changes to debian/ubiquity.ubiquity.upstart

  • Committer: Evan Dandrea
  • Date: 2010-03-02 14:20:17 UTC
  • Revision ID: evan.dandrea@canonical.com-20100302142017-gzo76v5p3jalchrv
Move the greeter functionality into ubiquity itself, still
accessible with the maybe-ubiquity boot option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/ubiquity.ubiquity.upstart
37
37
                ;;
38
38
            maybe-ubiquity)
39
39
                ubiquity=1
40
 
                choose="--choose"
 
40
                choose="--greeter"
41
41
                ;;
42
42
            only-ubiquity)
43
43
                ubiquity=1
67
67
    if [ -n "$noninteractive" ]; then
68
68
        exec ubiquity noninteractive $debug
69
69
    else
70
 
        if ! ubiquity-dm $choose vt7 :0 ubuntu -- /usr/bin/ubiquity $debug $automatic --only; then
 
70
        if ! ubiquity-dm vt7 :0 ubuntu /usr/bin/ubiquity $debug $automatic $choose --only; then
71
71
            # has X crashed, or has ubiquity?
72
72
            if ! [ -f /var/log/installer/version ]; then
73
73
                exec ubiquity noninteractive $debug