Отключения ввода пароля домена при загрузке

client/client.py

@@ -1058,8 +1058,12 @@ class Client(commandServer, encrypt, Desktop):
                 yield remotePw
             if remotePw:
                 self.printERROR(_("Wrong password"))
-            yield self.askPassword(\
-                    _("Domain password for the desktop"),False)
+            # не запрашвать пароль при загрузке системы
+            if not path.exists('/prc/self/fd/0') or \
+                os.readlink('/proc/self/fd/0') != '/dev/console':
+                yield self.askPassword(\
+                        _("Domain password for the desktop"),False)
+                self.printERROR(_("Wrong password"))
 
         pathRemote = "/var/calculate/remote"
         for pwdRemote in passwdQueue():
@@ -1067,7 +1071,6 @@ class Client(commandServer, encrypt, Desktop):
             if sambaPasswordCheck("client",pwdRemote,domain,"remote"):
                 self.clVars.Set('cl_remote_pw',pwdRemote)
                 return True
-        self.printERROR(_("Wrong password"))
         return False
 
     def writeClientVars(self,domain,currentVersion,pwdRemote):