changed source.list management (yet more to fix)

conf/includes/legos.conf.sh

@@ -7,6 +7,9 @@ export PROXYAPTPORT="3142"
 export PROXYSRV="proxy.$MAINDOM"
 export PROXYSRVPORT="3128"
 
+# Distribution sources.list (Ubuntu Focal)
+export APT_SOURCE_LIST="ubuntu_focal.list"
+
 # Langues supportés et langue du systême
 export LOCALESET="en_US.UTF-8 fr_FR.UTF-8"
 export SYSLOCALE="fr_FR.UTF-8"

modules/upgrade_dist.sh

@@ -18,9 +18,6 @@ export VER_upgrade_dist="0.0.10"
 # The following var must stay empty
 export DEP_upgrade_dist=""
 
-# The following var must stay empty
-export DEP_upgrade_dist=""
-
 upgrade_dist()
 {
     local proxyfile=/etc/apt/apt.conf.d/00proxy
@@ -43,7 +40,9 @@ upgrade_dist()
     fi
     
     # Remplace source.list from dist with ours (be smarter)
-    installfile debian_bulleyes.list /etc/apt/sources.list
+    if [[ -n $APT_LIST_FILE ]]; then
+        installfile $APT_LIST_FILE /etc/apt/sources.list
+    fi
     
     prnt I "Mise à jour de la liste des paquets..."
     pkgupdt

repo/hosts/vm-cups4/debian_bulleyes.list

@@ -0,0 +1 @@
+../../common/debian_bulleyes.list