~ubuntu-branches/ubuntu/karmic/ltspfs/karmic

« back to all changes in this revision

Viewing changes to scripts/cdpinger

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2007-06-20 15:34:14 UTC
  • Revision ID: james.westby@ubuntu.com-20070620153414-6y19ybfufhtw09s8
Tags: 0.4.3-0ubuntu7
quick fix to ldm socket pathname 

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
        os.rmdir(mountpoint)
28
28
 
29
29
def get_login():
30
 
   if os.path.exists('/tmp/.ltspfs-socket'):
31
 
       p1=Popen(["/usr/bin/lsof", "/tmp/.ltspfs-socket"], stdout=PIPE)
 
30
   if os.path.exists('/var/run/ldm_socket'):
 
31
       p1=Popen(["/usr/bin/lsof", "/var/run/ldm_socket"], stdout=PIPE)
32
32
       p2 = Popen(["grep", "ssh"], stdin=p1.stdout, stdout=PIPE)
33
33
       pid = p2.communicate()[0].split()[1].strip()
34
34
   else:
67
67
    if fd.read().find(mountpoint) > 0:
68
68
        user=get_login()
69
69
        if user:
70
 
            call(['/usr/bin/ssh', '-S', '/tmp/.ltspfs-socket', user,
 
70
            call(['/usr/bin/ssh', '-S', '/var/run/ldm_socket', user,
71
71
                  '/usr/sbin/ltspfsmounter', mountpoint, option])
72
72
        else:
73
73
            if os.path.exists('/var/run/.delayed-mount'):