Changeset 2844

Timestamp:

Nov 14, 2016, 9:08:57 AM (4 years ago)

Author:

joamuran

Message:

New release, view changelog

Location:

lmd/trunk/fuentes

Files:

• admin-center-ltsp.install/lliurex-ltsp/src/css/imageManager.css (modified) (1 diff)
• admin-center-ltsp.install/lliurex-ltsp/src/exported.html (modified) (1 diff)
• admin-center-ltsp.install/lliurex-ltsp/src/images.html (modified) (4 diffs)
• admin-center-ltsp.install/lliurex-ltsp/src/js/imageManager.js (modified) (5 diffs)
• admin-center-ltsp.install/lliurex-ltsp/src/llx-ltsconf.html (modified) (1 diff)
• admin-center-ltsp.install/lliurex-ltsp/src/ltsp-client-management.html (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• lmd-lliurex-data.install/usr/share/ltsp/plugins/ltsp-build-client/Ubuntu/094-lliurex (modified) (1 diff)
• lmd-server.install/usr/share/llxbootmanager/www-boot/pxemenu.d/90-netinstall.php (deleted)
• lmd-server.install/usr/share/n4d/python-plugins/LmdBootManager.py (modified) (3 diffs)

lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/css/imageManager.css

@@ -139 +139 @@
             
 
-
 /* Image Creation Assistant */
 

lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/exported.html

@@ -4 +4 @@
 <div class="container">
 
-<div class="panel panel-default" style="padding: 0px; margin-top: 100px">
+<div class="panel panel-default" style="padding: 0px;">
 <div class="panel-heading"><h2 i18n>lmd.Image.Exports</h2></div>
         <!--div class='col-md-9 well bs-component col-md-offset-2' id="Llx_ltsp_images_exported"-->

lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/images.html

@@ -6 +6 @@
 
 <div class="container">
-<div class="panel panel-default" style="padding: 0px; margin-top: 100px">
+<div class="panel panel-default" style="padding: 0px;">
 <div class="panel-heading"><h2  i18n>lmd.Image.List</h2></div>
 <div id="LtspImageManagerContainer" class="panel-body">
@@ -36 +36 @@
         
       <!-- Stage 1 -->
-      <div id="llx-ltsp-image-assistant-stage-1" style="display:none">
+      <div id="llx-ltsp-image-assistant-stage-1" style="display:none; overflow: hidden">
           <div class="modal-header">
             <button type="button" class="close llx-ltsp-image-assistant-close" data-dismiss="llx-ltsp-new-image-assistant" aria-hidden="true">×</button>
@@ -46 +46 @@
             <div id="llx-ltsp-assistant-image-templates">
                 
-                <div i18n image_client_desc="Minimal Thin Client Image" id="llx_ltsp_lliurex_minimal_image" image_client_name="LliureXMini" class="llx_ltsp_template_div">
+                <div i18n image_client_desc="Minimal Thin Client Image" id="llx_ltsp_lliurex_minimal_image" image_client_name="LliureXMini" class="llx_ltsp_template_div col-md-6">
                     <div class="llx_ltsp_template_img" style="background-image: url(modules/lliurex-ltsp/src/css/img/llx-desktop13.png);"></div>
                     <div class="llx_ltsp_template_namedesc"><div class="llx_ltsp_template_name" i18n>Minimal Thin Client</div><div class="llx_ltsp_template_desc" i18n>This is a minimal image to run thin clients with no need of a mirror in the server. Easy and quick.</div></div>                
@@ -61 +61 @@
       
       <!-- Stage 2 -->
-      <div id="llx-ltsp-image-assistant-stage-2" style="display:none">
+      <div id="llx-ltsp-image-assistant-stage-2" style="display:none; overflow: hidden">
           <div class="modal-header">
             <button type="button" class="close llx-ltsp-image-assistant-close" data-dismiss="llx-ltsp-new-image-assistant" aria-hidden="true">×</button>

lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/js/imageManager.js

@@ -6 +6 @@
     this.imageMinimalInstalled=null;
     this.timer=null;
+    this.mirrorReady=false;
+    this.mirror32bit=false;
+    this.mirror64bit=false;
 }
 
@@ -988 +991 @@
         //console.log(typeof(templatelist));
         
-        for (template in templatelist) {        
+        for (var template in templatelist) {        
             var templatefile=templatelist[template];
             var credentials="";
@@ -996 +999 @@
     
             Utils.n4d(credentials, n4dclass, n4dmethod, arglist, function(response){
-                self.DrawTemplateIntoAssistant(response);
+                //console.log(response);
+                template=JSON.parse(response);
+                //alert("Compare "+template.default.arch+ "with i386 and check mirror32 is: "+self.mirror32bit);
+                //alert("or "+template.default.arch+ "with amd64 and check mirror64 is: "+self.mirror64bit);
+                if ((template.default.arch==="i386" && self.mirror32bit) || (template.default.arch==="amd64" && self.mirror64bit))
+                    self.DrawTemplateIntoAssistant(template);
              });
              
@@ -1009 +1017 @@
 ImageManager.prototype.DrawTemplateIntoAssistant=function DrawTemplateIntoAssistant(template){
     //var self=this;
-    template=JSON.parse(template);
-    var templateDiv=$(document.createElement("div")).attr("templateFileName", template.meta_inf.name).addClass("llx_ltsp_template_div");
+    var templateDiv=$(document.createElement("div")).attr("templateFileName", template.meta_inf.name).addClass("llx_ltsp_template_div col-md-5");
     var img=$(document.createElement("div")).css("background-image", "url(modules/lliurex-ltsp/src/css/img/"+template.default.llx_img+")").addClass("llx_ltsp_template_img");
     var namedesc=$(document.createElement("div")).addClass("llx_ltsp_template_namedesc");
@@ -1245 +1252 @@
 }
 
+ImageManager.prototype.getMirrorConfig=function getMirrorConfig(callback){
+    var self=this;
+    
+    var credentials="";
+    var n4dclass="MirrorManager";
+    var n4dmethod="get_all_configs";
+    var arglist=[];
+    
+    Utils.n4d(credentials, n4dclass, n4dmethod, arglist, function(response){
+        
+        self.mirrorReady=response.status;
+        var archs=response.msg.llx16.ARCHITECTURES;
+        
+        for (i in archs){
+           if (archs[i]==="amd64") self.mirror64bit=true;
+           if (archs[i]==="i386") self.mirror32bit=true;
+        }
+        
+        callback();
+        
+    });
+}
+
 
 ImageManager.prototype.init=function init(){
   var self=this;
-  //console.log(self.getImageList);
-  //console.log(self.RenderImageList);
-  
-  /*
-   * DEPRECATED....
-   *self.getImageList(function(imagelist){
-    // getimagelist: returns list of images
-    console.log("IMAGELIST1 ************************* INIT ************************** INIT **********************************");
-    self.imageList=imagelist; // assign to self.imagelist
-    console.log("IMAGELIST2 ************************* INIT ************************** INIT **********************************");
-    self.RenderImageList();   // and draw it
-    });
-  */
-  
-  //self.checkImageList();
+  
   self.getImageList();
   
   self.checkMinimalImageIsInstalled();
-  self.getAvailableTemplates();
+  self.getMirrorConfig(function(){self.getAvailableTemplates();});
   self.bindEvents();
 }

lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/llx-ltsconf.html

@@ -1 @@
-<div class='container row ' id="Llx_ltsconf_contendor"  style='margin-top:100px'>       
+<div class='container row ' id="Llx_ltsconf_contendor" >        
         <div class='col-md-6 well bs-component col-md-offset-3'>
                 <form class="form-horizontal" id="llx_ltsconf_bootoptions">

lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/ltsp-client-management.html

@@ -5 +5 @@
 </div-->
 
-<div class="panel panel-default col-md-10 col-md-offset-1" style="padding: 0px; margin-top: 100px">
+<div class="panel panel-default col-md-10 col-md-offset-1" style="padding: 0px;">
         <div class="panel-heading"><h2 i18n>Clients</h2></div>
         <div id="ltsp-clients" class="panel-body">

lmd/trunk/fuentes/debian/changelog

@@ +1 @@
+lmd (2.4.58) xenial; urgency=high
+
+  * Removed netinstall methods to fix it in netinstall module
+  * Fixed some mirror names
+  * Fixed image manager to check mirror before create an image
+
+ --  <joamuran@gmail.com>  Mon, 14 Nov 2016 09:02:27 +0100
+
 lmd (2.4.57) xenial; urgency=high
 

lmd/trunk/fuentes/debian/control

@@ -15 +15 @@
 
 Package: lmd-server
-Depends: ${misc:Depends}, dnsmasq, ltsp-server-standalone, ltsp-server, php7.0-cli, apache2, libapache2-mod-php7.0, n4d-remote-gui-plugin, llx-netinstall ( >= 0.21), n4d-lliurex-base ( >= 0.6 ), python, syslinux-common, llx-bootmanager (>>0.1), util-linux, python-apt, python-simplewebsocketserver
+Depends: ${misc:Depends}, dnsmasq, ltsp-server-standalone, ltsp-server, php7.0-cli, apache2, libapache2-mod-php7.0, n4d-remote-gui-plugin, llx-netinstall ( >= 0.21), n4d-lliurex-base ( >= 0.6 ), python, syslinux-common, llx-bootmanager (>>0.1), util-linux, python-apt, python-simplewebsocketserver, xpra ( >= 0.17.3-1)
 Conflicts: lliurex-ltsp, n4d-ltsp-plugins
 Replaces: lliurex-ltsp, n4d-ltsp-plugins

lmd/trunk/fuentes/lmd-lliurex-data.install/usr/share/ltsp/plugins/ltsp-build-client/Ubuntu/094-lliurex

@@ -11 +11 @@
         esac
 
-        [ ! -d /opt/ltsp/$CHROOT/net/mirror/llx1605 ] || umount -l /opt/ltsp/$CHROOT/net/mirror/llx1605
+        [ ! -d /opt/ltsp/$CHROOT/net/mirror/llx1605 ] || umount -l /opt/ltsp/$CHROOT/net/mirror/llx16
         # Working about nsswitch and friends
         if [ -f /opt/ltsp/$CHROOT/etc/ldap.conf ] ; then

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

@@ -15 +15 @@
         def getNetinstall(self):
                 '''
+                DEPRECATED
                 Reads file /etc/ltsp/bootopts/netinstall and returns true or false
                 '''
@@ -46 +47 @@
         def setNetinstall(self, status, unattended):
                 '''
+                DEPRECATED
                 sets option for netinstall int bootopt.json (status and unattended install)
                 '''
@@ -79 +81 @@
         def setNetinstallUnattended(self, status, username, password, rootpassword):
                 '''
+                DEPRECATED
                 Writing in presseed username and password
                 '''