|
|
|
@ -573,7 +573,7 @@ conjunction with the 'login' or 'logout'")
|
|
|
|
|
"""Находится ли компьютер в домене"""
|
|
|
|
|
self.createClVars(self.clVars)
|
|
|
|
|
foundMountRemote =self.isMount("/var/calculate/remote" ,"cifs")
|
|
|
|
|
foundMountHome =self.isMount("/var/calculate/home" ,"none", False)
|
|
|
|
|
foundMountHome =self.isMount("/var/calculate/client-home","none",False)
|
|
|
|
|
if not (self.clVars.Get("cl_remote_host") and foundMountRemote and\
|
|
|
|
|
foundMountHome):
|
|
|
|
|
self.printERROR("The computer is not in domain")
|
|
|
|
@ -605,11 +605,12 @@ conjunction with the 'login' or 'logout'")
|
|
|
|
|
domain = self.clVars.Get("cl_remote_host")
|
|
|
|
|
if domain:
|
|
|
|
|
foundMountRemote = self.isMount("/var/calculate/remote" ,"cifs")
|
|
|
|
|
foundMountHome = self.isMount("/var/calculate/home" ,"none", False)
|
|
|
|
|
foundMountHome = self.isMount("/var/calculate/client-home","none",
|
|
|
|
|
False)
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR("The computer is not in domain")
|
|
|
|
|
return False
|
|
|
|
|
pathHome = "/var/calculate/home"
|
|
|
|
|
pathHome = "/var/calculate/client-home"
|
|
|
|
|
if foundMountRemote:
|
|
|
|
|
self.printWARNING(_("Samba resource [remote] is mount") + \
|
|
|
|
|
" ...")
|
|
|
|
@ -658,7 +659,7 @@ conjunction with the 'login' or 'logout'")
|
|
|
|
|
return False
|
|
|
|
|
self.createClVars()
|
|
|
|
|
pathRemote = "/var/calculate/remote"
|
|
|
|
|
pathHome = "/var/calculate/home"
|
|
|
|
|
pathHome = "/var/calculate/client-home"
|
|
|
|
|
foundMountRemote =self.isMount(pathRemote ,"cifs")
|
|
|
|
|
foundMountHome =self.isMount(pathHome ,"none",False)
|
|
|
|
|
domain = self.clVars.Get("cl_remote_host")
|
|
|
|
@ -669,7 +670,7 @@ conjunction with the 'login' or 'logout'")
|
|
|
|
|
umountStr = "umount %s"%(pathRemote)
|
|
|
|
|
textLine = self.execProg(umountStr)
|
|
|
|
|
if not (textLine == None):
|
|
|
|
|
self.printERROR(_("Can not unmount Samba resource [remote]") + \
|
|
|
|
|
self.printERROR(_("Can not unmount Samba resource [remote]") +\
|
|
|
|
|
" ...")
|
|
|
|
|
return False
|
|
|
|
|
if foundMountHome:
|
|
|
|
@ -731,7 +732,7 @@ conjunction with the 'login' or 'logout'")
|
|
|
|
|
self.clVars.Get("cl_remote_host") == domain:
|
|
|
|
|
pwd = self.clVars.Get("cl_remote_pw")
|
|
|
|
|
foundMountRemote =self.isMount("/var/calculate/remote" ,"cifs")
|
|
|
|
|
foundMountHome =self.isMount("/var/calculate/home" ,"none", False)
|
|
|
|
|
foundMountHome =self.isMount("/var/calculate/client-home","none",False)
|
|
|
|
|
if foundMountRemote:
|
|
|
|
|
self.printWARNING(_("Samba resource [remote] mount") + \
|
|
|
|
|
" ...")
|
|
|
|
@ -758,7 +759,7 @@ conjunction with the 'login' or 'logout'")
|
|
|
|
|
" ...")
|
|
|
|
|
self.clVars.Write("cl_remote_host", domain, False, "local")
|
|
|
|
|
self.clVars.Write("cl_remote_pw", userPwd, False, "local")
|
|
|
|
|
pathHome = "/var/calculate/home"
|
|
|
|
|
pathHome = "/var/calculate/client-home"
|
|
|
|
|
if foundMountHome:
|
|
|
|
|
self.printWARNING(str(pathHome)+ " " +_("is mount")+
|
|
|
|
|
" ...")
|
|
|
|
|