Fixes for server_cockpit, server_filesystem and release_identification in 9.1 & 8.7 #142

Merged
AlanMarshall merged 5 commits from 9.1_agm into develop 2023-01-20 18:57:38 +00:00
5 changed files with 34 additions and 2 deletions
Showing only changes of commit 9969d275fa - Show all commits

View file

@ -0,0 +1,16 @@
{
"area": [
{
"height": 77,
"width": 232,
"type": "match",
"ypos": 221,
"xpos": 515
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_login"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 KiB

View file

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 200,
"height": 77,
"type": "match",
"width": 232,
"xpos": 515
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_login"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 KiB

View file

@ -43,7 +43,7 @@ sub run {
my $ver_major = substr($version_id, 0, index($version_id, q/./));
my $ver_minor = substr($version_id, index($version_id, q/./), length($version_id));
my $target = lc($ver_major);
if ( $ver_major = '9' ) {
if ( $ver_major == '9' || '8' ) {
$target = lc($version_id);
}
@ -82,7 +82,7 @@ sub run {
# Test for Rocky Support Product
$strip = strip_marks($content{'ROCKY_SUPPORT_PRODUCT'});
if ( $ver_major = '9' ) {
if ( $ver_major == '9' || '8' ) {
$fullname = qq/$fullname $ver_major/;
$fullname =~ s/ /-/g;
}