← Back to branch summary

~andrea.corbellini/ubiquity/bug-531343

« back to all changes in this revision

Viewing changes to bin/ubiquity

  • 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:
bin/ubiquity
348
348
                      'better suit a minimal environment.')
349
349
    parser.add_option('-q', '--query', dest='query', action='store_true',
350
350
                      help='find out which frontend will be used by default')
 
351
    parser.add_option('-g', '--greeter', dest='greeter', action='store_true',
 
352
                      help='allow the user to leave the installer and enter ' \
 
353
                      'a live desktop (for the initial boot).')
351
354
    (options, args) = parser.parse_args()
352
355
 
353
356
    if options.debug:
368
371
 
369
372
    if options.migration_assistant:
370
373
        os.environ['UBIQUITY_MIGRATION_ASSISTANT'] = '1'
 
374
    
 
375
    if options.greeter:
 
376
        os.environ['UBIQUITY_GREETER'] = '1'
371
377
 
372
378
    if options.only:
373
379
        os.environ['UBIQUITY_ONLY'] = '1'