diff --git a/boottools/btog.py b/boottools/btog.py index b6ce03e..3c7be4b 100644 --- a/boottools/btog.py +++ b/boottools/btog.py @@ -27,7 +27,7 @@ def GetOsInfo (type_client='host'): oscodename='precise' osrelease='3.2.0-23-generic' osarch='i386' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'wheezy' == type_client: # ogLive basado en Debian 7.3. osdistrib='debian' oscodename='wheezy' @@ -39,85 +39,85 @@ def GetOsInfo (type_client='host'): oscodename='quantal' osrelease='3.7.6-030706-generic' osarch='i386' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'raring' == type_client: # ogLive 1.0.5-rc3 basado en Ubuntu 13.04. osdistrib='ubuntu' oscodename='raring' osrelease='3.8.0-22-generic' osarch='i386' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'trusty' == type_client: # ogLive 1.0.5-rc4 basado en Ubuntu 14.04. osdistrib='ubuntu' oscodename='trusty' osrelease='3.13.0-24-generic' osarch='i386' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'vivid' == type_client: # ogLive 1.1.0-rc2 basado en Ubuntu 15.04. osdistrib='ubuntu' oscodename='vivid' osrelease='3.19.0-49-generic' osarch='i386' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'wily' == type_client: # ogLive 1.1.0-rc1 basado en Ubuntu 15.10. osdistrib='ubuntu' oscodename='wily' osrelease='4.2.0-35-generic' osarch='i386' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'xenial' == type_client or 'xenial-4.4' == type_client: # ogLive 1.1.0-rc4 basado en Ubuntu 16.04 y Kernel 4.4. osdistrib='ubuntu' oscodename='xenial' osrelease='4.4.0-34-generic' osarch='i386' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'xenial-4.8' == type_client: # ogLive 1.1.0-rc5 basado en Ubuntu 16.04 y Kernel 4.8. osdistrib='ubuntu' oscodename='xenial' osrelease='4.8.0-39-generic' osarch='amd64' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'xenial-4.13' == type_client: # ogLive 1.1.0-rc6 basado en Ubuntu 16.04 y Kernel 4.13. osdistrib='ubuntu' oscodename='xenial' osrelease='4.13.0-17-generic' osarch='amd64' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'bionic' == type_client or 'bionic-4.15' == type_client: # ogLive 1.1.1-rc1 basado en Ubuntu 18.04 y Kernel 4.15. osdistrib='ubuntu' oscodename='bionic' osrelease='4.15.0-32-generic' osarch='amd64' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'bionic-4.18' == type_client: # ogLive 1.1.1-rc3 basado en Ubuntu 18.04 y Kernel 4.18. osdistrib='ubuntu' oscodename='bionic' osrelease='4.18.0-20-generic' osarch='amd64' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'bionic-5.0' == type_client: # ogLive 1.1.1-rc5 basado en Ubuntu 18.04 y Kernel 5.0. osdistrib='ubuntu' oscodename='bionic' osrelease='5.0.0-27-generic' osarch='amd64' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'focal' == type_client: # ogLive 1.2.0-rc1 basado en Ubuntu 20.04 y Kernel 5.4. osdistrib='ubuntu' oscodename='focal' osrelease='5.4.0-42-generic' osarch='amd64' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'noble' == type_client: # ogLive 3.1.1 basado en Ubuntu 24.04 y Kernel 6.8. osdistrib='ubuntu' oscodename='noble' osrelease='6.8.0-31-generic' osarch='amd64' - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' elif 'host' == type_client: # ogLive basado en la distribución del servidor. osdistrib=platform.freedesktop_os_release()['NAME'] oscodename=platform.freedesktop_os_release()['VERSION_CODENAME'] osrelease=platform.uname()[2] osarch, _=utils.run (['dpkg', '--print-architecture']) - oshttp='http://es.archive.ubuntu.com/ubuntu/' + oshttp='http://fr.archive.ubuntu.com/ubuntu/' else: # Parámetro desconocido logger.error ('Parámetro no válido.') osdistrib=None diff --git a/includes/etc/apt/sources.list.ubuntu b/includes/etc/apt/sources.list.ubuntu index a6b7dfd..bb2848a 100644 --- a/includes/etc/apt/sources.list.ubuntu +++ b/includes/etc/apt/sources.list.ubuntu @@ -1,26 +1,26 @@ -deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME main restricted -deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME main restricted +deb http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME main restricted +deb-src http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME main restricted ## Major bug fix updates produced after the final release of the ## distribution. -deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-updates main restricted -deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-updates main restricted +deb http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME-updates main restricted +deb-src http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME-updates main restricted ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team. Also, please note that software in universe WILL NOT receive any ## review or updates from the Ubuntu security team. -deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME universe -deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME universe -deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-updates universe -deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-updates universe +deb http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME universe +deb-src http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME universe +deb http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME-updates universe +deb-src http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME-updates universe ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team, and may not be under a free licence. Please satisfy yourself as to ## your rights to use the software. Also, please note that software in ## multiverse WILL NOT receive any review or updates from the Ubuntu ## security team. -deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME multiverse -deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME multiverse -deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-updates multiverse -deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-updates multiverse +deb http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME multiverse +deb-src http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME multiverse +deb http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME-updates multiverse +deb-src http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME-updates multiverse ## Uncomment the following two lines to add software from the 'backports' ## repository. @@ -29,8 +29,8 @@ deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-updates multiverse ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-backports main restricted universe multiverse -deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-backports main restricted universe multiverse +deb http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME-backports main restricted universe multiverse +deb-src http://fr.archive.ubuntu.com/ubuntu/ OSCODENAME-backports main restricted universe multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository.