code drop for SL6 support
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9825 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -73,6 +73,7 @@ my %distnames = ( | ||||
|                  "1241464993.830723" => "rhas4.8", #x86-64 | ||||
|  | ||||
| 		 "1273608367.051780" => "SL5.5", #x86_64 DVD ISO | ||||
| 		 "1299104542.844706" => "SL6", #x86_64 DVD ISO | ||||
|                  ); | ||||
| my %numdiscs = ( | ||||
|                 "1156364963.862322" => 4, | ||||
| @@ -554,9 +555,9 @@ sub mknetboot | ||||
| 		        } | ||||
|  | ||||
|                 # special case for redhat6, fedora12/13/14 | ||||
|                 if ($osver =~ m/rhel6/ || $osver =~ m/rhels6/  | ||||
|                 if ($osver =~ m/rhel6/ || $osver =~ m/rhels6/ | ||||
|                     || $osver =~ m/fedora12/ || $osver =~ m/fedora13/  | ||||
|                     || $osver =~ m/fedora14/ ) { | ||||
|                     || $osver =~ m/fedora14/ || $osver =~ m/SL6/) { | ||||
|                     $kcmdline = "root=nfs:$nfssrv:$nfsdir/rootimg:ro STATEMNT="; | ||||
|                 } else { | ||||
|                     $kcmdline = "NFSROOT=$nfssrv:$nfsdir STATEMNT=";	 | ||||
| @@ -728,27 +729,28 @@ sub mknetboot | ||||
|         # special case for the dracut-enabled OSes | ||||
|         if ($osver =~ m/rhels6/ || $osver =~ m/rhel6/  | ||||
|             || $osver =~ m/fedora12/ || $osver =~ m/fedora13/ | ||||
|             || $osver =~ m/fedora14/ ) { | ||||
|             || $osver =~ m/fedora14/ || $osver =~ m/SL6/) { | ||||
|             if($statelite and $rootfstype eq "ramdisk") { | ||||
|                 $initrdstr = "xcat/netboot/$osver/$arch/$profile/initrd-stateless.gz"; | ||||
|             } | ||||
|         } | ||||
| 		 | ||||
| 		if($statelite) | ||||
| 		{ | ||||
| 		    my $statelitetb = xCAT::Table->new('statelite'); | ||||
| 		    my $mntopts = $statelitetb->getAttribs({node => $node}, 'mntopts'); | ||||
| 		     | ||||
| 		    my $mntoptions = $mntopts->{'mntopts'}; | ||||
| 		    unless (defined($mntoptions)) | ||||
| 		    { | ||||
| 				$kcmdline .= " MNTOPTS="; | ||||
| 			} | ||||
| 			else | ||||
| 			{ | ||||
| 				$kcmdline .= " MNTOPTS=$mntoptions"; | ||||
| 			}			 | ||||
| 		} | ||||
|  | ||||
|         if($statelite) | ||||
|         { | ||||
|             my $statelitetb = xCAT::Table->new('statelite'); | ||||
|             my $mntopts = $statelitetb->getAttribs({node => $node}, 'mntopts'); | ||||
|  | ||||
|             my $mntoptions = $mntopts->{'mntopts'}; | ||||
|             unless (defined($mntoptions)) | ||||
|             { | ||||
|                 $kcmdline .= " MNTOPTS="; | ||||
|             } | ||||
|             else | ||||
|             { | ||||
|                 $kcmdline .= " MNTOPTS=$mntoptions"; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         $bptab->setNodeAttribs( | ||||
|             $node, | ||||
|             { | ||||
|   | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/install/SL/compute.SL6.pkglist
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/install/SL/compute.SL6.pkglist
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/compute.rhels6.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/install/SL/compute.SL6.tmpl
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/install/SL/compute.SL6.tmpl
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/compute.rhels6.tmpl | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/compute.SL6.pkglist
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/compute.SL6.pkglist
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../rh/compute.rhels6.pkglist | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/check
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/check
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../../rh/dracut/check | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/install.netboot
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/install.netboot
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../../rh/dracut/install.netboot | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/install.statelite
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/install.statelite
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../../rh/dracut/install.statelite | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/installkernel
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/installkernel
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../../rh/dracut/installkernel | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/xcat-cmdline.sh
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/xcat-cmdline.sh
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../../rh/dracut/xcat-cmdline.sh | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/xcat-prepivot.sh
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/xcat-prepivot.sh
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../../rh/dracut/xcat-prepivot.sh | ||||
							
								
								
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/xcatroot
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								xCAT-server/share/xcat/netboot/SL/dracut/xcatroot
									
									
									
									
									
										Symbolic link
									
								
							| @@ -0,0 +1 @@ | ||||
| ../../rh/dracut/xcatroot | ||||
		Reference in New Issue
	
	Block a user