Changeset 5541

Timestamp:

Jul 18, 2017, 9:22:18 AM (3 years ago)

Author:

hectorgh

Message:

fixing shutdown-lliurex to better support thin clients

File:

• lliurex-shutdowner/trunk/fuentes/lliurex-shutdowner-common.install/usr/sbin/shutdown-lliurex (modified) (2 diffs)

lliurex-shutdowner/trunk/fuentes/lliurex-shutdowner-common.install/usr/sbin/shutdown-lliurex

@@ -5 +5 @@
 import time
 
+thinclient_cron_file="/etc/cron.d/lliurex-shutdowner-thinclients"
 wait_time=1
+
 p=subprocess.Popen(["who"],shell=True,stdout=subprocess.PIPE).communicate()[0]
-ret=os.system("lliurex-version -t server")
+is_server=os.system("lliurex-version -t server")
 is_thin=os.system("lliurex-version -x thin")
 
-thinclient_cron_file="/etc/cron.d/lliurex-shutdowner-thinclients"
-
-if ret==0:
-        if is_thin!=0:
+if is_server==0:
+        if not os.path.exists(thinclient_cron_file):
                 wait_time=2
 
@@ -19 +19 @@
 shutdown_date="%s:%s"%(t.tm_hour,t.tm_min+wait_time)
 
-displays=set()
 
-for item in p.strip("\n").split("\n"):
-        x=item.split(" ")
-        user=x[0]
-        if "(" not in x[-1] or ")" not in x[-1] or ":" not in x[-1] or "." not in x[-1]:
-                continue
-        display=x[-1].lstrip("(").rstrip(")")
-        
-        # If thinclient_cron_file exists, this is being called from the server to show shutdown dialog
-        # to thin clients
-        # if this is being called from the server and thincron_file doesn't exist, then it means server
-        # will handle every dialog call
-        
-        if is_thin==0 and os.path.exists(thincron_file):
-                if len(display.split(":")[0].split("."))<4:
+if is_thin!=0:
+        displays=set()
+        for item in p.strip("\n").split("\n"):
+                
+                x=item.split(" ")
+                user=x[0]
+                if "(" not in x[-1] or ")" not in x[-1] or ":" not in x[-1] or "." not in x[-1]:
                         continue
-        
-        if display not in displays:
-                displays.add(display)
-        else:
-                continue
-        cmd="su -c 'DISPLAY=%s /usr/sbin/shutdown-lliurex-dialog %s' %s &"%(display,wait_time,user)
-        os.system(cmd)
+                display=x[-1].lstrip("(").rstrip(")")
+                
+                if os.path.exists(thinclient_cron_file):
+                        if len(display.split(":")[0].split("."))<4:
+                                continue
+                
+                if display not in displays:
+                        displays.add(display)
+                else:
+                        continue
+                
+                cmd="su -c 'DISPLAY=%s /usr/sbin/shutdown-lliurex-dialog %s' %s &"%(display,wait_time,user)
+                os.system(cmd)
 
 
-if is_thin!=0:
+if is_thin!=0 and not os.path.exists(thinclient_cron_file):
         os.system("/sbin/shutdown -h +%s"%wait_time)
-else:
-        if is_thin==0:
-                if not os.path.exists(thincron_file):
-                        # this means this is being called inside thin client
-                        time.sleep(60*wait_time)
-                        os.system("n4d-client -r -m shutdown -c ShutdownerClient")
-                else:
-                        #this means this is being called from the server
-                        #Shutdown will be handled inside thin client
-                        pass
 
+if is_thin==0 and not os.path.exists(thinclient_cron_file):
+        time.sleep(60*wait_time)
+        os.system("n4d-client -r -m shutdown -c ShutdownerClient")