From e01ac3ebee820b37a8a72f2f8e74dfd8777777ff Mon Sep 17 00:00:00 2001
From: Peter Ajamian <peter@pajamian.dhs.org>
Date: Sun, 16 May 2021 14:05:42 +1200
Subject: [PATCH] Springdale fixes

- Remove devel repo (can be put back when it becomes a thing with rocky).
- Fix filtering of header lines when parsing module list.
---
 migrate2rocky.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/migrate2rocky.sh b/migrate2rocky.sh
index 5a5eecd..0a742d2 100644
--- a/migrate2rocky.sh
+++ b/migrate2rocky.sh
@@ -157,7 +157,6 @@ repoinfo () {
             BEGIN {FS="[)(]"}
             /^# Managed by \(.*\) subscription-manager$/ {print $2}
         ' < "${repoinfo_results[Repo-filename]}"
-
     )
 }
 
@@ -186,11 +185,11 @@ collect_system_info () {
     pkg_repo_map=(
 	[baseos]=rootfiles.noarch
 	[appstream]=apr-util-ldap.$ARCH
-	[devel]=quota-devel.$ARCH
 	[ha]=pacemaker-doc.noarch
 	[powertools]=libaec-devel.$ARCH
 	[extras]=epel-release.noarch
     )
+#	[devel]=quota-devel.$ARCH
 
     PRETTY_NAME=$(os-release PRETTY_NAME)
     printf '%s\n' "${blue}Preparing to migrate $PRETTY_NAME to Rocky Linux 8.$nocolor"
@@ -305,8 +304,8 @@ collect_system_info () {
 	dnf -q "${repo_map[@]/#/--repo=}" module list --enabled |
 	awk '
 	    $1 == "@modulefailsafe", /^$/ {next}
-	    $1 == "Name", /^$/ {if (line++>0 && !/^$/) print $1":"$2}
-    	'
+	    $1 == "Name", /^$/ {if ($1!="Name" && !/^$/) print $1":"$2}
+    	' | sort -u
 	set +e +o pipefail
     )