Changeset 3670
- Timestamp:
- Feb 20, 2017, 12:02:44 PM (4 years ago)
- Location:
- lmd/trunk/fuentes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lmd/trunk/fuentes/debian/changelog
r3652 r3670 1 lmd (2.7.1) xenial; urgency=high 2 3 * LmdServer.py: Added automatic chroot check arch if it's not specified in json image descriptor (avoid ws.close error) 4 5 -- <joamuran@gmail.com> Mon, 20 Feb 2017 11:58:59 +0100 6 1 7 lmd (2.7) xenial; urgency=high 2 8 -
lmd/trunk/fuentes/lmd-server.install/usr/share/n4d/python-plugins/LmdServer.py
r3324 r3670 224 224 json_file.close(); 225 225 226 arch="linux64" 227 if jsonClient['arch']=="i386": 228 arch="linux32" 229 226 arch="linux32" 227 228 # Ask for arch in image description 229 if ('arch' in jsonClient): 230 arch="linux64" 231 if jsonClient['arch']=="i386": 232 arch="linux32" 233 else: 234 # If arch does not exists, let's ask it to chroot 235 cmd="ltsp chroot -p -m -a "+imgid+" uname -m" 236 proc=subprocess.Popen("uname -m", stdout=subprocess.PIPE, shell=True); 237 (out, err) = proc.communicate() 238 machine2arch = {'AMD64': 'linux64', 'x86_64': 'linux64'} 239 arch=machine2arch.get(out.strip("\n"), "linux32") 240 230 241 command=arch + " ltsp-chroot -p -m -a "+imgid+" dpkg-reconfigure libgl1-mesa-dri ; " 231 242 command=command + arch + " ltsp-chroot -p -m -a "+imgid+" /usr/share/ltsp/update-kernels && "
Note: See TracChangeset
for help on using the changeset viewer.