From 497caea155204ec5a9e34f581534ef88634db7f7 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 21 May 2008 16:29:16 +0000
Subject: [PATCH] fixed corrupted copycerts file

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1464 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server-2.0/sbin/copycerts | 197 ++++++++++++++++-----------------
 1 file changed, 96 insertions(+), 101 deletions(-)

diff --git a/xCAT-server-2.0/sbin/copycerts b/xCAT-server-2.0/sbin/copycerts
index 811483409..2395b80fb 100644
--- a/xCAT-server-2.0/sbin/copycerts
+++ b/xCAT-server-2.0/sbin/copycerts
@@ -1,101 +1,96 @@
-#!/usr/bin/perl
-# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
-#egan@us.ibm.com
-#(C)IBM Corp
-
-#
-
-BEGIN
-{
-    $::XCATROOT =
-        $ENV{'XCATROOT'} ? $ENV{'XCATROOT'}
-      : -d '/opt/xcat'   ? '/opt/xcat'
-      : '/usr';
-}
-use lib "$::XCATROOT/lib/perl";
-use File::Basename;
-use Getopt::Long;
-use xCAT::MsgUtils;
-use xCAT::Utils;
-my $bname = basename($0);
-
-#-----------------------------------------------------------------------------
-
-=head1   copycerts 
-
- This updates the service node with files necessary to access the 
- database on the MasterNode and restarts the xcat daemon
- run from servicenode postinstall script
-
-=cut
-
-#-----------------------------------------------------------------------------
-
-&copyCertstoSN;
-
-exit 0;
-
-#-----------------------------------------------------------------------------
-
-=head3 copyCertstoSN 
-  
-  Copy from the mounted /xcatpost/ directory to the MS /install/postscripts 
-  directory the /install/postscripts/ca  install/postscripts/cert and 
-  /install/postscripts/_xcat into the local file system.  These certificate are
-  needed for the postresql db setup for the service node to be able to access
-  the DB from the service node. 
-
-=cut
-
-#-----------------------------------------------------------------------------
-sub copyCertstoSN
-{
-    my $rc = 0;
-    `touch /etc/xCATSN`;
-    if (-d "/xcatpost/_xcat")
-    {
-        if (!(-d "/root/.xcat"))
-        {
-            mkdir("/root/.xcat", 0600);
-        }
-        `cp -f -rp /xcatpost/_xcat/* /root/.xcat`;
-        `chmod 0600 /root/.xcat/*`;
-    }
-    else
-    {
-        xCAT::MsgUtils->message('S',
-                                "/xcatpost/_xcat directory does not exist\n");
-
-    }
-    if (-d "/xcatpost/ca")
-    {
-        if (!(-d "/etc/xcat"))
-        {
-            mkdir("/etc/xcat", 0755);
-        }
-        if (!(-d "/etc/xcat/ca"))
-        {
-            mkdir("/etc/xcat/ca", 0755);
-        }
-        `cp -f -rp /xcatpost/ca/* /etc/xcat/ca`;
-        `chmod 0600 /etc/xcat/ca/*`;
-        `chmod 0600 /etc/xcat/ca/certs/*`;
-    }
-    else
-    {
-        xCAT::MsgUtils->message('S', "/xcatpost/ca directory does not exist\n");
-
-    }
-    if (-d "/xcatpost/etc/xcat") {
-    `cp -f /xcatpost/etc/xcat/cfgloc /etc/xcat/cfgloc`;
-     chmod 0600, "/etc/xcat/cfgloc";
-    }
-    else
-    {
-        xCAT::MsgUtils->message('S',
-                                "/xcatpost/etc/xcat directory does not exit\n");
-
-    }
-    return $rc;
-}
-
+#!/usr/bin/env perl
+# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+
+BEGIN
+{
+    $::XCATROOT =
+        $ENV{'XCATROOT'} ? $ENV{'XCATROOT'}
+      : -d '/opt/xcat'   ? '/opt/xcat'
+      : '/usr';
+}
+use lib "$::XCATROOT/lib/perl";
+use File::Basename;
+use Getopt::Long;
+use xCAT::MsgUtils;
+use xCAT::Utils;
+my $bname = basename($0);
+
+#-----------------------------------------------------------------------------
+
+=head1   copycerts
+
+ This updates the service node with files necessary to access the
+ database on the MasterNode and restarts the xcat daemon
+ run from servicenode postinstall script
+
+=cut
+
+#-----------------------------------------------------------------------------
+
+&copyCertstoSN;
+
+exit 0;
+
+#-----------------------------------------------------------------------------
+
+=head3 copyCertstoSN
+
+  Copy from the mounted /xcatpost/ directory to the MS /install/postscripts
+  directory the /install/postscripts/ca  install/postscripts/cert and
+  /install/postscripts/_xcat into the local file system.  These certificate are
+  needed for the postresql db setup for the service node to be able to access
+  the DB from the service node.
+
+=cut
+
+#-----------------------------------------------------------------------------
+sub copyCertstoSN
+{
+    my $rc = 0;
+    `touch /etc/xCATSN`;
+    if (-d "/xcatpost/_xcat")
+    {
+        if (!(-d "/root/.xcat"))
+        {
+            mkdir("/root/.xcat", 0600);
+        }
+        `cp -f -rp /xcatpost/_xcat/* /root/.xcat`;
+        `chmod 0600 /root/.xcat/*`;
+    }
+    else
+    {
+        xCAT::MsgUtils->message('S',
+                                "/xcatpost/_xcat directory does not exist\n");
+
+    }
+    if (-d "/xcatpost/ca")
+    {
+        if (!(-d "/etc/xcat"))
+        {
+            mkdir("/etc/xcat", 0755);
+        }
+        if (!(-d "/etc/xcat/ca"))
+        {
+            mkdir("/etc/xcat/ca", 0755);
+        }
+        `cp -f -rp /xcatpost/ca/* /etc/xcat/ca`;
+        `chmod 0600 /etc/xcat/ca/*`;
+        `chmod 0600 /etc/xcat/ca/certs/*`;
+    }
+    else
+    {
+        xCAT::MsgUtils->message('S', "/xcatpost/ca directory does not exist\n");
+
+    }
+    if (-d "/xcatpost/etc/xcat") {
+    `cp -f /xcatpost/etc/xcat/cfgloc /etc/xcat/cfgloc`;
+     chmod 0600, "/etc/xcat/cfgloc";
+    }
+    else
+    {
+        xCAT::MsgUtils->message('S',
+                                "/xcatpost/etc/xcat directory does not exit\n");
+
+    }
+    return $rc;
+}