From 84db0169aa2cbfb4ad43c694b426f55228ffbc85 Mon Sep 17 00:00:00 2001 From: levasseur Date: Fri, 24 Sep 2021 17:45:29 +0200 Subject: [PATCH] changed source.list management (yet more to fix) --- conf/includes/legos.conf.sh | 3 +++ modules/upgrade_dist.sh | 7 +++---- repo/hosts/vm-cups4/debian_bulleyes.list | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) create mode 120000 repo/hosts/vm-cups4/debian_bulleyes.list diff --git a/conf/includes/legos.conf.sh b/conf/includes/legos.conf.sh index a930c0c..9b697fb 100644 --- a/conf/includes/legos.conf.sh +++ b/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" diff --git a/modules/upgrade_dist.sh b/modules/upgrade_dist.sh index 99b5af3..3d6fcdf 100644 --- a/modules/upgrade_dist.sh +++ b/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 diff --git a/repo/hosts/vm-cups4/debian_bulleyes.list b/repo/hosts/vm-cups4/debian_bulleyes.list new file mode 120000 index 0000000..68163d2 --- /dev/null +++ b/repo/hosts/vm-cups4/debian_bulleyes.list @@ -0,0 +1 @@ +../../common/debian_bulleyes.list \ No newline at end of file