Have default of /install for copycds if no config specified, explicit syslinux rpm dependency
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@579 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		@@ -66,9 +66,9 @@ sub mknetboot {
 | 
			
		||||
       $imgsrv = $sent->{value};
 | 
			
		||||
    }
 | 
			
		||||
    my $installroot;
 | 
			
		||||
    $installroot = "/install";
 | 
			
		||||
    if ($sitetab) { 
 | 
			
		||||
        (my $ref) = $sitetab->getAttribs({key=>installdir},value);
 | 
			
		||||
        print Dumper($ref);
 | 
			
		||||
        if ($ref and $ref->{value}) {
 | 
			
		||||
            $installroot = $ref->{value};
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -98,6 +98,7 @@ sub mknetboot {
 | 
			
		||||
       $imgsrv = $sent->{value};
 | 
			
		||||
    }
 | 
			
		||||
    my $installroot;
 | 
			
		||||
    $installroot = "/install";
 | 
			
		||||
    if ($sitetab) { 
 | 
			
		||||
        (my $ref) = $sitetab->getAttribs({key=>installdir},value);
 | 
			
		||||
        if ($ref and $ref->{value}) {
 | 
			
		||||
 
 | 
			
		||||
@@ -59,6 +59,7 @@ sub mknetboot {
 | 
			
		||||
       $imgsrv = $sent->{value};
 | 
			
		||||
    }
 | 
			
		||||
    my $installroot;
 | 
			
		||||
    $installroot="/install";
 | 
			
		||||
    if ($sitetab) { 
 | 
			
		||||
        (my $ref) = $sitetab->getAttribs({key=>installdir},value);
 | 
			
		||||
        print Dumper($ref);
 | 
			
		||||
 
 | 
			
		||||
@@ -142,6 +142,7 @@ sub copycd {
 | 
			
		||||
  my $callback = shift;
 | 
			
		||||
  my $doreq = shift;
 | 
			
		||||
  my $installroot;
 | 
			
		||||
  $installroot="/install";
 | 
			
		||||
  my $sitetab = xCAT::Table->new('site');
 | 
			
		||||
  if ($sitetab) { 
 | 
			
		||||
    (my $ref) = $sitetab->getAttribs({key=>installdir},value);
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,7 @@ Provides: xCAT = %{version}
 | 
			
		||||
Requires: xCAT-server xCAT-client perl-DBD-SQLite perl-xCAT 
 | 
			
		||||
 | 
			
		||||
%ifos linux
 | 
			
		||||
Requires: tftp-server dhcp httpd nfs-utils expect conserver fping bind
 | 
			
		||||
Requires: tftp-server dhcp httpd nfs-utils expect conserver fping bind syslinux
 | 
			
		||||
%endif
 | 
			
		||||
 | 
			
		||||
%ifarch i386 i586 i686 x86 x86_64
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user