Changeset 3686
- Timestamp:
- Feb 21, 2017, 3:01:22 PM (4 years ago)
- Location:
- llx-netinstall/trunk/fuentes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
llx-netinstall/trunk/fuentes/admin-center-llx-netinstall.install/lliurex-netinstall/src/js/lliurex-netinstall.js
r3684 r3686 160 160 var password=($("#llx_netinstall_setnetinstall_pass").val()); 161 161 var rootpassword=($("#llx_netinstall_setnetinstall_pass_root").val()); 162 162 163 if (self.unattended_netinstall){ 163 164 if (! username || !password || !rootpassword){ … … 217 218 }; 218 219 220 LlxNetinstall.prototype.showMirrorUnavailable=function showMirrorUnavailable(){ 221 var self=this; 222 223 msg="<h4>"+self._("llx_netinstall_mirror_unavailable")+"</h4>"; 224 $("#llx_netinstall_config").append(msg); 225 } 226 219 227 LlxNetinstall.prototype.checkMirrorAvailable=function checkMirrorAvailable(){ 220 228 … … 222 230 var credentials=""; 223 231 var n4dclass="MirrorManager"; 224 var n4dmethod=" get_all_configs";232 var n4dmethod="is_mirror_available"; 225 233 var arglist=""; 226 234 227 235 Utils.n4d(credentials, n4dclass, n4dmethod, arglist, function(response){ 228 if(response.status) self.getNetinstallConfig();229 else {self.showMirrorUnavailable();230 msg="<h4>"+self._("llx_netinstall_mirror_unavailable")+"</h4>";231 $("#llx_netinstall_config").append(msg);236 if(response.status){ 237 self.getNetinstallConfig(); 238 } else { 239 self.showMirrorUnavailable(); 232 240 } 233 241 }); -
llx-netinstall/trunk/fuentes/debian/changelog
r3632 r3686 1 llx-netinstall (0.59) xenial; urgency=medium 2 3 * Fixed blocking bug when installing without unattended option 4 * Increased password generation 5 * New mirror availability checking before showing netinstall options 6 7 -- M.Angel Juan <m.angel.juan@gmail.com> Tue, 21 Feb 2017 14:58:32 +0100 8 1 9 llx-netinstall (0.58) xenial; urgency=medium 2 10 -
llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/n4d/python-plugins/NetinstallManager.py
r3632 r3686 9 9 import os 10 10 import subprocess 11 import string 12 import random 13 import crypt 14 11 15 class NetinstallManager: 12 16 … … 214 218 Writing in presseed username and password 215 219 ''' 216 if not username or not password or not rootpassword:220 if status == True and (not username or not password or not rootpassword): 217 221 return {"status":"false", "msg": "Usernames or Passwords can't be an empty string"} 218 222 try: … … 226 230 preseed=open(filepath,'w') 227 231 preseed.write("# LMD Created user account\n") 228 salt="sw9.tfRI" 229 userpassencrypted=crypt.crypt(str(password),"$1$"+salt+"$") 230 rootpassencrypted=crypt.crypt(str(rootpassword),"$1$"+salt+"$") 232 salt=''.join([random.choice(string.ascii_letters + string.digits) for _ in range(16)]) 233 userpassencrypted=crypt.crypt(str(password),"$6$"+salt+"$") 234 salt=''.join([random.choice(string.ascii_letters + string.digits) for _ in range(16)]) 235 rootpassencrypted=crypt.crypt(str(rootpassword),"$6$"+salt+"$") 231 236 232 237 if(status==True):
Note: See TracChangeset
for help on using the changeset viewer.