mirror of
https://github.com/rocky-linux/rocky-tools.git
synced 2024-11-25 22:46:26 +00:00
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.
This commit is contained in:
parent
6534aaa584
commit
e01ac3ebee
@ -157,7 +157,6 @@ repoinfo () {
|
|||||||
BEGIN {FS="[)(]"}
|
BEGIN {FS="[)(]"}
|
||||||
/^# Managed by \(.*\) subscription-manager$/ {print $2}
|
/^# Managed by \(.*\) subscription-manager$/ {print $2}
|
||||||
' < "${repoinfo_results[Repo-filename]}"
|
' < "${repoinfo_results[Repo-filename]}"
|
||||||
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -186,11 +185,11 @@ collect_system_info () {
|
|||||||
pkg_repo_map=(
|
pkg_repo_map=(
|
||||||
[baseos]=rootfiles.noarch
|
[baseos]=rootfiles.noarch
|
||||||
[appstream]=apr-util-ldap.$ARCH
|
[appstream]=apr-util-ldap.$ARCH
|
||||||
[devel]=quota-devel.$ARCH
|
|
||||||
[ha]=pacemaker-doc.noarch
|
[ha]=pacemaker-doc.noarch
|
||||||
[powertools]=libaec-devel.$ARCH
|
[powertools]=libaec-devel.$ARCH
|
||||||
[extras]=epel-release.noarch
|
[extras]=epel-release.noarch
|
||||||
)
|
)
|
||||||
|
# [devel]=quota-devel.$ARCH
|
||||||
|
|
||||||
PRETTY_NAME=$(os-release PRETTY_NAME)
|
PRETTY_NAME=$(os-release PRETTY_NAME)
|
||||||
printf '%s\n' "${blue}Preparing to migrate $PRETTY_NAME to Rocky Linux 8.$nocolor"
|
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 |
|
dnf -q "${repo_map[@]/#/--repo=}" module list --enabled |
|
||||||
awk '
|
awk '
|
||||||
$1 == "@modulefailsafe", /^$/ {next}
|
$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
|
set +e +o pipefail
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user