mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 03:12:30 +00:00 
			
		
		
		
	Support Oracle Linux on service nodes
This commit is contained in:
		| @@ -136,13 +136,6 @@ our %distnames = ( | ||||
|     "1390839789.062069" => "SL6.5",         #x86_64 DVD ISO Install | ||||
|  | ||||
|     "1529960248.065311" => "ol6.10",        # x86_64, Oracle Linux 6.10 | ||||
|     "1565395001.564692" => "ol7.7",         # x86_64, Oracle Linux 7.7 | ||||
|     "1586293815.797636" => "ol7.8",         # x86_64, Oracle Linux 7.8 | ||||
|     "1601956087.745957" => "ol7.9",         # x86_64, Oracle Linux 7.9 | ||||
|     "1563868563.575621" => "ol8.0",         # x86_64, Oracle Linux 8.0 | ||||
|     "1573718260.172018" => "ol8.1",         # x86_64, Oracle Linux 8.1 | ||||
|     "1588679121.349755" => "ol8.2",         # x86_64, Oracle Linux 8.2 | ||||
|     "1604965593.730885" => "ol8.3",         # x86_64, Oracle Linux 8.3 | ||||
|  | ||||
|     "1394111947.452332" => "pkvm2.1",       # ppc64, PowerKVM | ||||
|     "1413749127.352649" => "pkvm2.1.1",     # ppc64, PowerKVM | ||||
|   | ||||
| @@ -2033,7 +2033,7 @@ sub copycd | ||||
|  | ||||
|     if (-r $mntpath . "/.discinfo") | ||||
|     { | ||||
|         print "DEBUG - [anaconda.pm] Attempt to detemine OS information from the .discinfo file ...\n"; | ||||
|         print "DEBUG - [anaconda.pm] Attempt to detemine OS information from the $mntpath/.discinfo file ...\n"; | ||||
|         open($dinfo, $mntpath . "/.discinfo"); | ||||
|  | ||||
|         $did = <$dinfo>; | ||||
| @@ -2073,7 +2073,7 @@ sub copycd | ||||
|             $dno = $1; | ||||
|         } | ||||
|     } | ||||
|     print "DEBUG - [anaconda.pm] Distname=$distname, OS=$desc, ARCH=$arch, Version=$dno\n"; | ||||
|     print "DEBUG - [anaconda.pm] Distname=$distname, OS=$desc, ARCH=$darch, Version=$dno\n"; | ||||
|  | ||||
|     unless ($distname) | ||||
|     { | ||||
| @@ -2109,6 +2109,24 @@ sub copycd | ||||
|             } | ||||
|             close($dinfo); | ||||
|         } | ||||
|         elsif ($desc =~ /Oracle Linux/) | ||||
|         { | ||||
|             # | ||||
|             # Attempt to auto-detect for OL8 OS, the last element has typically been the version | ||||
|             # ex: "Oracle Linux 8.3.0" | ||||
|             # | ||||
|             my @ol_version = split / /, $desc; | ||||
|             $distname = "ol" . $ol_version[-1]; | ||||
|         } | ||||
|         elsif ($desc =~ /OL-/) | ||||
|         { | ||||
|             # | ||||
|             # Attempt to auto-detect for OL7 OS, the last element has typically been the version | ||||
|             # ex: OL-7.9 Server.x86_64 | ||||
|             # | ||||
|             my @ol_version = split /[- ]/, $desc; | ||||
|             $distname = "ol" . $ol_version[1]; | ||||
|         } | ||||
|         elsif ($desc =~ /^[\d\.]+$/) | ||||
|         { | ||||
|             open($dinfo, $mntpath . "/.treeinfo"); | ||||
|   | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/install/ol/service.ol7.tmpl
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/install/ol/service.ol7.tmpl
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels7.tmpl | ||||
| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels7.x86_64.otherpkgs.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/install/ol/service.ol7.x86_64.pkglist
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/install/ol/service.ol7.x86_64.pkglist
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels7.x86_64.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/install/ol/service.ol8.pkglist
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/install/ol/service.ol8.pkglist
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels8.pkglist | ||||
| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels8.ppc64le.otherpkgs.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/install/ol/service.ol8.tmpl
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/install/ol/service.ol8.tmpl
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels8.tmpl | ||||
| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels8.x86_64.otherpkgs.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol7.x86_64.exlist
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol7.x86_64.exlist
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels7.x86_64.exlist | ||||
| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels7.x86_64.otherpkgs.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol7.x86_64.pkglist
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol7.x86_64.pkglist
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels7.x86_64.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol7.x86_64.postinstall
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol7.x86_64.postinstall
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels7.x86_64.postinstall | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol8.x86_64.exlist
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol8.x86_64.exlist
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels8.x86_64.exlist | ||||
| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels8.x86_64.otherpkgs.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol8.x86_64.pkglist
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol8.x86_64.pkglist
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels8.x86_64.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol8.x86_64.postinstall
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/ol/service.ol8.x86_64.postinstall
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/service.rhels8.x86_64.postinstall | ||||
		Reference in New Issue
	
	Block a user