← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to bin/ubiquity-dm

  • Committer: Michael Terry
  • Date: 2009-06-29 19:40:27 UTC
  • mto: This revision was merged to the branch mainline in revision 3313.
  • Revision ID: michael.terry@canonical.com-20090629194027-m3nh6flp0y3wdlx0
don't partition in oem-mode and lots of small changes to get nearer a working state

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubiquity-dm
26
26
    pass
27
27
 
28
28
class DM:
29
 
    def __init__(self, vt, display):
 
29
    def __init__(self, vt, display, default_username):
30
30
        self.vt = vt
31
31
        self.display = display
32
32
        self.server_started = False
33
33
 
34
 
        self.username = get_casper('USERNAME', 'ubuntu')
 
34
        self.username = get_casper('USERNAME', default_username)
35
35
        self.uid, self.gid = pwd.getpwnam(self.username)[2:4]
36
36
        self.homedir = pwd.getpwnam(self.username)[5]
37
37
        self.uid = int(self.uid)
247
247
        else:
248
248
            return 1
249
249
 
250
 
if len(sys.argv) < 3:
251
 
    sys.stderr.write('Usage: %s <vt[1-N]> <:[0-N]> <program> [<arguments>]\n' % sys.argv[0])
 
250
if len(sys.argv) < 4:
 
251
    sys.stderr.write('Usage: %s <vt[1-N]> <:[0-N]> <username> <program> [<arguments>]\n' % sys.argv[0])
252
252
    sys.exit(1)
253
253
 
254
 
vt, display = sys.argv[1:3]
 
254
vt, display, username = sys.argv[1:4]
255
255
try:
256
 
    dm = DM(vt, display)
 
256
    dm = DM(vt, display, username)
257
257
except XStartupError:
258
258
    sys.exit(1)
259
259
proc = None
261
261
    proc = ['/etc/init.d/gdm', 'start']
262
262
elif dm.frontend == 'kde_ui':
263
263
    proc = ['/etc/init.d/kdm', 'start']
264
 
ret = dm.run(*sys.argv[3:])
 
264
ret = dm.run(*sys.argv[4:])
265
265
if proc:
266
266
    subprocess.Popen(proc)
267
267
sys.exit(ret)