From 8a07958e65306635ea2cf9d1d837d9233083cce4 Mon Sep 17 00:00:00 2001 From: Chung Chung Date: Thu, 16 Jul 2026 16:13:58 -0400 Subject: [PATCH] Add ofarm and lofarm to be recognized as FARM Signed-off-by: Chung Chung --- .../perl-Permabit-checkServer.spec | 5 ++++- perl/bin/checkServer.pl | 7 +++++-- perl/checkServer/CheckServer/Host.pm | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packaging/perl-Permabit-checkServer/perl-Permabit-checkServer.spec b/packaging/perl-Permabit-checkServer/perl-Permabit-checkServer.spec index 394fc48..087beb9 100644 --- a/packaging/perl-Permabit-checkServer/perl-Permabit-checkServer.spec +++ b/packaging/perl-Permabit-checkServer/perl-Permabit-checkServer.spec @@ -1,7 +1,7 @@ %define base_name Permabit-checkServer Name: perl-%{base_name} Version: 1.0 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Permabit checkServer utility License: GPL2+ URL: https://github.com/dm-vdo/common @@ -98,6 +98,9 @@ find %{buildroot} -type f -name .packlist -delete %{_fixperms} -c %{buildroot} %changelog +* Thu Jul 16 2026 Chung Chung - 1.0-39 +- Add ofarm support + * Fri Oct 31 2025 Chung Chung - 1.0-38 - Add Fedora 43 support diff --git a/perl/bin/checkServer.pl b/perl/bin/checkServer.pl index a2f7ca9..d8343c8 100755 --- a/perl/bin/checkServer.pl +++ b/perl/bin/checkServer.pl @@ -1328,6 +1328,7 @@ sub _getOsClass { fedora41 => \&isFortyOne, fedora42 => \&isAdams, fedora43 => \&isFortyThree, + fedora44 => \&isFortyFour, rawhide => \&isRawhide, ); # Fedora linux-next kernel can run on any Fedora OS. Check to see if @@ -1685,6 +1686,8 @@ sub _isFarm { return _hostInList( 'jfarm', 'pfarm', + 'ofarm', + 'lofarm', ) || (getScamVar('FARM') eq 'yes'); } @@ -1731,14 +1734,14 @@ sub _isJFarm { # Check if this host is a pfarm class machine ## sub _isPFarm { - return _hostInList('pfarm'); + return _hostInList('pfarm', 'ofarm'); } ###################################################################### # Check if this host is a pfarm class machine ## sub _isPMIFarm { - return _hostInList('pmifarm'); + return _hostInList('pmifarm', 'lofarm'); } ###################################################################### diff --git a/perl/checkServer/CheckServer/Host.pm b/perl/checkServer/CheckServer/Host.pm index 3466261..94390b4 100644 --- a/perl/checkServer/CheckServer/Host.pm +++ b/perl/checkServer/CheckServer/Host.pm @@ -122,7 +122,7 @@ sub isJFarm { ## sub isPFarm { my ($self) = assertNumArgs(1, @_); - return ($self->{_getCachedName()} //= $self->hostnameMatches(qr/^pfarm-/)); + return ($self->{_getCachedName()} //= $self->hostnameMatches(qr/^[po]farm-/)); } ######################################################################