diff --git a/Providers/Modules/Plugins/PatchManagement/plugin/patch_management_lib.rb b/Providers/Modules/Plugins/PatchManagement/plugin/patch_management_lib.rb index 2bd9a8f9f..0cef8a513 100644 --- a/Providers/Modules/Plugins/PatchManagement/plugin/patch_management_lib.rb +++ b/Providers/Modules/Plugins/PatchManagement/plugin/patch_management_lib.rb @@ -51,6 +51,14 @@ def getHostOSDetails() def getOSShortName(os_short_name = nil, os_version=nil) version = "" hostOSDetailsMap = getHostOSDetails() + #os short name is not proper for oracle linux at /etc/opt/microsoft/scx/conf/scx-release. this is to return proper short name till scx fixes the issue. + if hostOSDetailsMap.key?("OSFullName") && hostOSDetailsMap.key?("OSShortName") + osFullName = hostOSDetailsMap["OSFullName"] + osShortName = hostOSDetailsMap["OSShortName"] + if osFullName.downcase.include?("oracle") && ! osShortName.downcase.include?("oracle") + os_short_name = "Oracle" + end + end # match string of the form (1 or more non . chars)- followed by a . - (1 or more non . chars) - followed by anything if hostOSDetailsMap.key?("OSShortName") @@ -104,6 +112,8 @@ def getOSShortName(os_short_name = nil, os_version=nil) else version = @default_version end + when "Oracle" + version = "6.0" when "SUSE" if @os_major_version == "11" version = "11.0" diff --git a/installbuilder/datafiles/Base_DSC.data b/installbuilder/datafiles/Base_DSC.data index b73b48df7..48aff8f06 100755 --- a/installbuilder/datafiles/Base_DSC.data +++ b/installbuilder/datafiles/Base_DSC.data @@ -98,7 +98,7 @@ SHLIB_EXT: 'so' /opt/microsoft/omsconfig/module_packages/nxOMSContainers_1.0.zip; release/nxOMSContainers_1.0.zip; 755; ${{RUN_AS_USER}}; root /opt/microsoft/omsconfig/module_packages/nxOMSCustomLog_1.0.zip; release/nxOMSCustomLog_1.0.zip; 755; ${{RUN_AS_USER}}; root /opt/microsoft/omsconfig/module_packages/nxOMSGenerateInventoryMof_1.5.zip; release/nxOMSGenerateInventoryMof_1.5.zip; 755; ${{RUN_AS_USER}}; root -/opt/microsoft/omsconfig/module_packages/nxOMSPlugin_3.57.zip; release/nxOMSPlugin_3.58.zip; 755; ${{RUN_AS_USER}}; root +/opt/microsoft/omsconfig/module_packages/nxOMSPlugin_3.58.zip; release/nxOMSPlugin_3.58.zip; 755; ${{RUN_AS_USER}}; root /opt/microsoft/omsconfig/module_packages/nxOMSWLI_1.46.zip; release/nxOMSWLI_1.46.zip; 755; ${{RUN_AS_USER}}; root #endif