Changeset 3632

Timestamp:

Feb 15, 2017, 2:30:03 PM (3 years ago)

Author:

mabarracus

Message:

Enable infantil netinstall
Fixed allow admin-center's empty password or username selecting unnatended netinstall

Location:

llx-netinstall/trunk/fuentes

Files:

• admin-center-llx-netinstall.install/lliurex-netinstall/src/i18n/ca-ES@valencia/messages.json (modified) (1 diff)
• admin-center-llx-netinstall.install/lliurex-netinstall/src/i18n/en-US/messages.json (modified) (1 diff)
• admin-center-llx-netinstall.install/lliurex-netinstall/src/i18n/es-ES/messages.json (modified) (1 diff)
• admin-center-llx-netinstall.install/lliurex-netinstall/src/js/lliurex-netinstall.js (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• install.llx-netinstall/usr/share/llx-netinstall/templates/d-i-late-command (modified) (1 diff)
• install.llx-netinstall/usr/share/llx-netinstall/templates/infantil-stats.cfg (modified) (1 diff)
• install.llx-netinstall/usr/share/llx-netinstall/templates/infantil.cfg (modified) (1 diff)
• install.llx-netinstall/usr/share/n4d/python-plugins/NetinstallManager.py (modified) (1 diff)
• install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/amd64/boot-screens/txt-stats.cfg (modified) (1 diff)
• install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/amd64/boot-screens/txt.cfg (modified) (1 diff)
• install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/i386/boot-screens/txt-stats.cfg (modified) (1 diff)
• install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/i386/boot-screens/txt.cfg (modified) (1 diff)

llx-netinstall/trunk/fuentes/admin-center-llx-netinstall.install/lliurex-netinstall/src/i18n/ca-ES@valencia/messages.json

@@ -15 +15 @@
      "llx_netinstall_apply_config":["Aplica"],
      "llx_netinstall_error":["S'ha produït l'error següent en configurar la instal·lació per xarxa: "],
+     "llx_netinstall_no_user":["El nom d'usuari o contrasenya no poden ser cadenes buides "],
      "llx_netinstall_success":["S'ha configurat correctament la instal·lació d'equips per xarxa"],
      "llx_netinstall_mirror_unavailable":["No hi ha disponible cap rèplica de LliureX per a fer la instal·lació per xarxa"],

llx-netinstall/trunk/fuentes/admin-center-llx-netinstall.install/lliurex-netinstall/src/i18n/en-US/messages.json

@@ -15 +15 @@
      "llx_netinstall_apply_config":["Apply"],
      "llx_netinstall_error":["Network install has produced the error: "],
+     "llx_netinstall_no_user":["Username or Password can't be an empty string"],
      "llx_netinstall_success":["Network install has been configured"],
      "llx_netinstall_mirror_unavailable":["There is no any LliureX Mirror for network installation"],

llx-netinstall/trunk/fuentes/admin-center-llx-netinstall.install/lliurex-netinstall/src/i18n/es-ES/messages.json

@@ -15 +15 @@
      "llx_netinstall_apply_config":["Aplica"],
      "llx_netinstall_error":["Se produjo el siguiente error en configurar la instalación por red: "],
+     "llx_netinstall_no_user":["El nombre de usuario o passwords no pueden ser cadenas vacias "],
      "llx_netinstall_success":["Se configuró correctamente la instalación de equipos por red"],
      "llx_netinstall_mirror_unavailable":["No se encuentra una réplica de LliureX para realizar la instalación por red"],

llx-netinstall/trunk/fuentes/admin-center-llx-netinstall.install/lliurex-netinstall/src/js/lliurex-netinstall.js

@@ -160 +160 @@
       var  password=($("#llx_netinstall_setnetinstall_pass").val());
       var  rootpassword=($("#llx_netinstall_setnetinstall_pass_root").val());
+      if (! username || !password || !rootpassword){
+        msg=self._("llx_netinstall_no_user");
+        Utils.msg(msg, MSG_ERROR);
+      }
 
       var credentials=[sessionStorage.username, sessionStorage.password];

llx-netinstall/trunk/fuentes/debian/changelog

@@ +1 @@
+llx-netinstall (0.58) xenial; urgency=medium
+
+  * Enable infantil netinstall
+  * Fixed allow admin-center's empty password or username selecting unnatended netinstall
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 15 Feb 2017 11:39:55 +0100
+
 llx-netinstall (0.57-1) xenial; urgency=medium
 

llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/llx-netinstall/templates/d-i-late-command

@@ -63 +63 @@
 put_apt_conf ${BASE_DIR} ${base_class}
 
-if [ "x$base_class" = "xinfantil" ]; then
-    in-target apt-get update
-    in-target apt-get -y install lliurex-meta-infantil
-fi
+#if [ "x$base_class" = "xinfantil" ]; then
+#    in-target apt-get update
+#    in-target apt-get -y install lliurex-meta-infantil
+#fi
 exit 0

llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/llx-netinstall/templates/infantil-stats.cfg

@@ -1 +1 @@
 d-i     preseed/include string  common.cfg unattended.cfg
 ldap-auth-config ldap-auth-config/ldapns/ldap-server string ldap://127.0.0.1/
-d-i     pkgsel/include  string  lliurex-meta-desktop
+d-i     pkgsel/include  string  lliurex-meta-infantil
 lliurex-statistics lliurex-statistics/unattended  boolean    true
 lliurex-statistics lliurex-statistics/acknowledge select  true
-
+d-i apt-setup/local0/comment string Preschool Repository
+d-i apt-setup/local0/repository string http://mirror/llx16 xenial main universe multiverse preschool

llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/llx-netinstall/templates/infantil.cfg

@@ -1 +1 @@
 d-i     preseed/include string  common.cfg unattended.cfg
 ldap-auth-config ldap-auth-config/ldapns/ldap-server string ldap://127.0.0.1/
-d-i     pkgsel/include  string  lliurex-meta-desktop
+d-i     pkgsel/include  string  lliurex-meta-infantil
+d-i apt-setup/local0/comment string Preschool Repository
+d-i apt-setup/local0/repository string http://mirror/llx16 xenial main universe multiverse preschool

llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/n4d/python-plugins/NetinstallManager.py

@@ -214 +214 @@
                 Writing in presseed username and password
                 '''                             
+                if not username or not password or not rootpassword:
+                    return {"status":"false", "msg": "Usernames or Passwords can't be an empty string"}
                 try:
                         filedir="/var/www/preseed"

llx-netinstall/trunk/fuentes/install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/amd64/boot-screens/txt-stats.cfg

@@ -11 +11 @@
         append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/desktop-stats.cfg net.ifnames=0 biosdevname=0 
 
-#label install Infantil
-#        menu label ^Install Infantil
-#        kernel ubuntu-installer/amd64/linux
-#        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil-stats.cfg net.ifnames=0 biosdevname=0 
+label install Infantil
+        menu label ^Install Infantil
+        kernel ubuntu-installer/amd64/linux
+        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil-stats.cfg net.ifnames=0 biosdevname=0 
 
 #label install gva

llx-netinstall/trunk/fuentes/install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/amd64/boot-screens/txt.cfg

@@ -11 +11 @@
         append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/desktop.cfg net.ifnames=0 biosdevname=0 
 
-#label install Infantil
-#        menu label ^Install Infantil
-#        kernel ubuntu-installer/amd64/linux
-#        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil.cfg net.ifnames=0 biosdevname=0 
+label install Infantil
+        menu label ^Install Infantil
+        kernel ubuntu-installer/amd64/linux
+        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil.cfg net.ifnames=0 biosdevname=0 
 
 #label install gva

llx-netinstall/trunk/fuentes/install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/i386/boot-screens/txt-stats.cfg

@@ -11 +11 @@
         append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/desktop-stats.cfg net.ifnames=0 biosdevname=0
 
-#label install Infantil
-#        menu label ^Install Infantil
-#        kernel ubuntu-installer/i386/linux
-#        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil-stats.cfg net.ifnames=0 biosdevname=0
+label install Infantil
+        menu label ^Install Infantil
+        kernel ubuntu-installer/i386/linux
+        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil-stats.cfg net.ifnames=0 biosdevname=0
 
 #label install gva

llx-netinstall/trunk/fuentes/install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/i386/boot-screens/txt.cfg

@@ -11 +11 @@
         append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/desktop.cfg net.ifnames=0 biosdevname=0
 
-#label install Infantil
-#        menu label ^Install Infantil
-#        kernel ubuntu-installer/i386/linux
-#        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil.cfg net.ifnames=0 biosdevname=0
+label install Infantil
+        menu label ^Install Infantil
+        kernel ubuntu-installer/i386/linux
+        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil.cfg net.ifnames=0 biosdevname=0
 
 #label install gva