Changeset 3670

Timestamp:

Feb 20, 2017, 12:02:44 PM (3 years ago)

Author:

joamuran

Message:

Fixed LmdServer? to check chroot arch

Location:

lmd/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lmd-server.install/usr/share/n4d/python-plugins/LmdServer.py (modified) (1 diff)

lmd/trunk/fuentes/debian/changelog

@@ +1 @@
+lmd (2.7.1) xenial; urgency=high
+
+  * LmdServer.py: Added automatic chroot check arch if it's not specified in json image descriptor (avoid ws.close error)
+
+ --  <joamuran@gmail.com>  Mon, 20 Feb 2017 11:58:59 +0100
+
 lmd (2.7) xenial; urgency=high
 

lmd/trunk/fuentes/lmd-server.install/usr/share/n4d/python-plugins/LmdServer.py

@@ -224 +224 @@
                         json_file.close();
 
-                        arch="linux64"
-                        if jsonClient['arch']=="i386":
-                                arch="linux32"
-                        
+                        arch="linux32"
+                        
+                        # Ask for arch in image description
+                        if ('arch' in jsonClient):
+                                arch="linux64"
+                                if jsonClient['arch']=="i386":
+                                        arch="linux32"
+                        else:
+                                # If arch does not exists, let's ask it to chroot
+                                cmd="ltsp chroot -p -m -a "+imgid+" uname -m"
+                                proc=subprocess.Popen("uname -m", stdout=subprocess.PIPE, shell=True);
+                                (out, err) = proc.communicate()
+                                machine2arch = {'AMD64': 'linux64', 'x86_64': 'linux64'}
+                                arch=machine2arch.get(out.strip("\n"), "linux32")
+                                                        
                         command=arch + " ltsp-chroot -p -m -a "+imgid+" dpkg-reconfigure libgl1-mesa-dri ;  "
                         command=command + arch + " ltsp-chroot -p -m -a "+imgid+" /usr/share/ltsp/update-kernels && "