From 7cdee0d9f164d1847cd8dde5f07f2c68c45f8521 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 25 Feb 2008 14:30:25 +0000 Subject: [PATCH] Remove mknb plugin debug output, fix xCAT-server spec file to deal with symlinks as intended for mknb git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@562 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server-2.0/lib/xcat/plugins/mknb.pm | 3 +-- xCAT-server-2.0/xCAT-server.spec | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xCAT-server-2.0/lib/xcat/plugins/mknb.pm b/xCAT-server-2.0/lib/xcat/plugins/mknb.pm index ee9c02be6..07c594230 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/mknb.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/mknb.pm @@ -3,7 +3,6 @@ use File::Temp qw(tempdir); use xCAT::Utils; use File::Path; use File::Copy; -use Data::Dumper; sub handled_commands { return { @@ -42,7 +41,7 @@ sub process_request { my $installdir = "/install"; my $tftpdir = "/tftpboot"; if (scalar(@{$request->{arg}}) != 1) { - $callback->({error=>Dumper($request)." Need to specifiy architecture (x86_64 or ppc64)"},{errorcode=>[1]}); + $callback->({error=>"Need to specifiy architecture (x86_64 or ppc64)"},{errorcode=>[1]}); return; } my $arch = $request->{arg}->[0]; diff --git a/xCAT-server-2.0/xCAT-server.spec b/xCAT-server-2.0/xCAT-server.spec index c45079965..ff0e517f8 100644 --- a/xCAT-server-2.0/xCAT-server.spec +++ b/xCAT-server-2.0/xCAT-server.spec @@ -50,7 +50,7 @@ cp -hpR share/xcat/install/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/ cp -hpR share/xcat/netboot/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/ %endif -cp sbin/* $RPM_BUILD_ROOT/%{prefix}/sbin +cp -d sbin/* $RPM_BUILD_ROOT/%{prefix}/sbin chmod 755 $RPM_BUILD_ROOT/%{prefix}/sbin/* cp share/xcat/ca/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/ca