From 56a496218ec35c830c0997f9e1dc19ebc370ea1d Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 26 Feb 2008 16:37:36 +0000
Subject: [PATCH] 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
---
 xCAT-server-2.0/lib/xcat/plugins/centos.pm | 2 +-
 xCAT-server-2.0/lib/xcat/plugins/fedora.pm | 1 +
 xCAT-server-2.0/lib/xcat/plugins/rhel.pm   | 1 +
 xCAT-server-2.0/lib/xcat/plugins/sles.pm   | 1 +
 xCAT/xCAT.spec                             | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xCAT-server-2.0/lib/xcat/plugins/centos.pm b/xCAT-server-2.0/lib/xcat/plugins/centos.pm
index 7f335e86b..2a73b6b65 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/centos.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/centos.pm
@@ -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};
         }
diff --git a/xCAT-server-2.0/lib/xcat/plugins/fedora.pm b/xCAT-server-2.0/lib/xcat/plugins/fedora.pm
index 90d141da7..9577f7024 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/fedora.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/fedora.pm
@@ -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}) {
diff --git a/xCAT-server-2.0/lib/xcat/plugins/rhel.pm b/xCAT-server-2.0/lib/xcat/plugins/rhel.pm
index 16d6b70f3..cb00af502 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/rhel.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/rhel.pm
@@ -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);
diff --git a/xCAT-server-2.0/lib/xcat/plugins/sles.pm b/xCAT-server-2.0/lib/xcat/plugins/sles.pm
index a9c9c81ac..83f64c596 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/sles.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/sles.pm
@@ -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);
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index eb6ed2587..c37ae7374 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -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