From 012046624239206f4989d64d6d2f2b68b71b805d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 27 Apr 2024 02:26:23 +0200
Subject: autoselection for installer_variant and some more ubunut noble fixes

---
 roles/apt-repo/base/tasks/main.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'roles/apt-repo/base/tasks')

diff --git a/roles/apt-repo/base/tasks/main.yml b/roles/apt-repo/base/tasks/main.yml
index 132f7702..668f6453 100644
--- a/roles/apt-repo/base/tasks/main.yml
+++ b/roles/apt-repo/base/tasks/main.yml
@@ -5,6 +5,14 @@
     dest: /etc/apt/sources.list
   register: apt_repo_base_sources
 
+- name: remove new-style ubuntu apt source entries
+  loop:
+  - ubuntu.sources
+  - ubuntu.sources.curtin.orig
+  file:
+    path: "/etc/apt/sources.list.d/{{ item }}"
+    state: absent
+
 - name: update apt cache
   when: apt_repo_base_sources is changed
   command: apt-get update
@@ -26,11 +34,3 @@
   file:
     path: /etc/apt/apt.conf.d/20apt-esm-hook.conf
     state: absent
-
-- name: remove new-style ubuntu apt source entries
-  loop:
-  - ubuntu.sources
-  - ubuntu.sources.curtin.orig
-  file:
-    path: "/etc/apt/sources.list.d/{{ item }}"
-    state: absent
-- 
cgit v1.2.3