postinst: migrate CIS to USG on Focal and Jammy

The old CIS entitlement will not be recognized on Focal and Jammy after version 35. This converts the .list file and changes cis/ to usg/ both in the source and authentication files when running on these series. Signed-off-by: Renan Rodrigo <[email protected]>
canonical · Oct 22, 2024 · 5a0ca04 · 5a0ca04
1 parent 03c90cf
commit 5a0ca04
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/debian/ubuntu-advantage-tools.postinst b/debian/ubuntu-advantage-tools.postinst
@@ -476,7 +476,7 @@ case "$1" in
       fi
 
       if dpkg --compare-versions "$PREVIOUS_PKG_VER" lt "31~"; then
-          /usr/lib/ubuntu-advantage/postinst-migrations.sh $PREVIOUS_PKG_VER
+          /usr/lib/ubuntu-advantage/postinst-migrations.sh $PREVIOUS_PKG_VER $VERSION_ID
       fi
       ;;
 esac

diff --git a/debian/ubuntu-pro-client.postinst b/debian/ubuntu-pro-client.postinst
@@ -53,7 +53,7 @@ case "$1" in
       #
 
       if dpkg --compare-versions "$PREVIOUS_PKG_VER" ge "31~"; then
-          /usr/lib/ubuntu-advantage/postinst-migrations.sh $PREVIOUS_PKG_VER
+          /usr/lib/ubuntu-advantage/postinst-migrations.sh $PREVIOUS_PKG_VER $VERSION_ID
       fi
 
       #

diff --git a/lib/postinst-migrations.sh b/lib/postinst-migrations.sh
@@ -45,6 +45,7 @@
 set -e
 
 PREVIOUS_PKG_VER=$1
+UBUNTU_RELEASE=$2
 
 if dpkg --compare-versions "$PREVIOUS_PKG_VER" lt "32~"; then
     # When we perform the write operation through
@@ -86,5 +87,15 @@ if dpkg --compare-versions "$PREVIOUS_PKG_VER" lt "35~"; then
     # is updated to include the snapshot urls for esm-infra and esm-apps
     if [ -f "/var/lib/ubuntu-advantage/private/machine-token.json" ]; then
         /usr/bin/python3 /usr/lib/ubuntu-advantage/add_esm_snapshot_auth.py
+
+    # On Focal and Jammy, the CIS service transitioned to USG from v35
+    # This changes the lists and authentication files to represent that
+    # in case CIS is enabled
+    if [ "$UBUNTU_RELEASE" = "20.04" ] || [ "$UBUNTU_RELEASE" = "22.04" ]; then
+        if [ -f /etc/apt/sources.list.d/ubuntu-cis.list ]; then
+            mv /etc/apt/sources.list.d/ubuntu-cis.list /etc/apt/sources.list.d/ubuntu-usg.list
+            sed -i 's#/cis/ubuntu#/usg/ubuntu#' /etc/apt/sources.list.d/ubuntu-usg.list
+            sed -i 's#/cis/ubuntu#/usg/ubuntu#' /etc/apt/auth.conf.d/90ubuntu-advantage
+        fi
     fi
 fi