From 6ca9bf959ca8e8856bea9ac6557fbb9b4df37fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Wed, 29 Aug 2018 11:14:38 +0200
Subject: [PATCH] Use 18.04 sources.list as template.

---
 3.New_server_deployment/4.APT_upgrade/0_setup.sh     | 8 ++++----
 3.New_server_deployment/4.APT_upgrade/sources.list   | 4 ++++
 3.New_server_deployment/4.APT_upgrade/sources16.list | 4 ----
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 3.New_server_deployment/4.APT_upgrade/sources.list
 delete mode 100644 3.New_server_deployment/4.APT_upgrade/sources16.list

diff --git a/3.New_server_deployment/4.APT_upgrade/0_setup.sh b/3.New_server_deployment/4.APT_upgrade/0_setup.sh
index 501706ce..5460a886 100755
--- a/3.New_server_deployment/4.APT_upgrade/0_setup.sh
+++ b/3.New_server_deployment/4.APT_upgrade/0_setup.sh
@@ -15,11 +15,11 @@ fi
 # update sources.list
 rm -f /etc/apt/sources.list~
 echo "Updating /etc/apt/sources.list file."
-cp sources16.list /etc/apt/sources.list
+cp sources.list /etc/apt/sources.list
 if ( rgrep '14.04' /etc/lsb-release >/dev/null ); then
-	sed -i 's@xenial@trusty@' /etc/apt/sources.list
-elif ( rgrep '18.04' /etc/lsb-release >/dev/null ); then
-	sed -i 's@xenial@bionic@' /etc/apt/sources.list
+	sed -i 's@bionic@trusty@' /etc/apt/sources.list
+elif ( rgrep '16.04' /etc/lsb-release >/dev/null ); then
+	sed -i 's@bionic@xenial@' /etc/apt/sources.list
 fi
 
 # modify sources.list to use ubicast cache
diff --git a/3.New_server_deployment/4.APT_upgrade/sources.list b/3.New_server_deployment/4.APT_upgrade/sources.list
new file mode 100644
index 00000000..06433ad7
--- /dev/null
+++ b/3.New_server_deployment/4.APT_upgrade/sources.list
@@ -0,0 +1,4 @@
+deb http://archive.ubuntu.com/ubuntu/ bionic           main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ bionic-updates   main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
+deb http://security.ubuntu.com/ubuntu bionic-security  main restricted universe multiverse
\ No newline at end of file
diff --git a/3.New_server_deployment/4.APT_upgrade/sources16.list b/3.New_server_deployment/4.APT_upgrade/sources16.list
deleted file mode 100644
index b967902f..00000000
--- a/3.New_server_deployment/4.APT_upgrade/sources16.list
+++ /dev/null
@@ -1,4 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ xenial           main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu/ xenial-updates   main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
-deb http://security.ubuntu.com/ubuntu xenial-security  main restricted universe multiverse
\ No newline at end of file
-- 
GitLab