Oracle Linux Support for Update Management (#796)

* Update patch_management_lib.rb Workaround for Update Management support for Oracle Linux. setting os short name as "Oracle" directly till it gets fixed at /etc/opt/microsoft/scx/conf/scx-release * Update patch_management_lib.rb fixed indentation * Update patch_management_lib.rb Workaround to fix os short name for Oracle Linux as "Oracle" till /etc/opt/microsoft/scx/conf/scx-release has proper OSShortName field. * Update patch_management_lib.rb shortName for Oracle. indentation fix * Update patch_management_lib.rb fixing indentation * Update patch_management_lib.rb * nxOMSPlugin Version Change Changing Version from 3.56 to 3.57 * Update patch_management_lib.rb Workaround for Update Management support for Oracle Linux. setting os short name as "Oracle" directly till it gets fixed at /etc/opt/microsoft/scx/conf/scx-release * Update patch_management_lib.rb fixed indentation * Update patch_management_lib.rb Workaround to fix os short name for Oracle Linux as "Oracle" till /etc/opt/microsoft/scx/conf/scx-release has proper OSShortName field. * Update patch_management_lib.rb shortName for Oracle. indentation fix * Update patch_management_lib.rb fixing indentation * Update patch_management_lib.rb * nxOMSPlugin Version Change Changing Version from 3.56 to 3.57 * Change in nxOMSPlugin Version * indentation fix * indetantion2 * Update patch_management_lib.rb * reverting version to 3.58
microsoft · Apr 29, 2021 · 346c0bd · 346c0bd
1 parent 4221c55
commit 346c0bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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