From 1aceee43e1940c498e48a7661a37059f9a601209 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 11 Feb 2009 17:33:58 +0000
Subject: [PATCH] change copy.perl script to copy.sh script to copy keys on the
 node.  Node may not have perl installed.  used in xdsh <noderange> -K

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2721 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Utils.pm             | 80 +++++++++++++++++------------
 xCAT-server/sbin/remoteshell.expect |  6 +--
 2 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index c999f5288..8140302c4 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -268,11 +268,11 @@ sub Version
     my $version = shift;
     if ($version eq 'short')
     {
-        $version = ''    #XCATVERSIONSUBHERE ;
+        $version = ''    . '2.2' ;
     }
     else
     {
-        $version = 'Version '    #XCATVERSIONSUBHERE #XCATSVNBUILDSUBHERE ;
+        $version = 'Version '    . '2.2' . ' (built Wed Feb 11 07:31:11 EST 2009)' ;
     }
     return $version;
 }
@@ -1179,36 +1179,52 @@ sub setupSSH
     }
 
     #  build the perl copy script in $HOME/.ssh/copy.perl
-    open(FILE, ">$home/.ssh/copy.perl")
-      or die "cannot open file $home/.ssh/copy.perl\n";
-    print FILE "#!/usr/bin/perl
-my (\$name,\$passwd,\$uid,\$gid,\$quota,\$comment,\$gcos,\$dir,\$shell,\$expire) = getpwnam($to_userid);
-my \$home = \$dir;
-umask(0077);
-\$dest_dir = \"\$home/.ssh/\";
-if (! -d \"\$dest_dir\" ) {
+    #open(FILE, ">$home/.ssh/copy.perl")
+    #  or die "cannot open file $home/.ssh/copy.perl\n";
+    #print FILE "#!/usr/bin/perl
+#my (\$name,\$passwd,\$uid,\$gid,\$quota,\$comment,\$gcos,\$dir,\$shell,\$expire) = getpwnam($to_userid);
+#my \$home = \$dir;
+#umask(0077);
+#\$dest_dir = \"\$home/.ssh/\";
+#if (! -d \"\$dest_dir\" ) {
     # create a local directory
-    \$cmd = \"mkdir -p \$dest_dir\";
-    system(\"\$cmd\");
-    chmod 0700, \$dest_dir;
-}
-`cat /tmp/$to_userid/.ssh/authorized_keys >> \$home/.ssh/authorized_keys 2>&1`;
-`cat /tmp/$to_userid/.ssh/authorized_keys2 >> \$home/.ssh/authorized_keys2 2>&1`;
-`cp /tmp/$to_userid/.ssh/id_rsa  \$home/.ssh/id_rsa 2>&1`;
-`cp /tmp/$to_userid/.ssh/id_dsa  \$home/.ssh/id_dsa 2>&1`;
-`chmod 0600 \$home/.ssh/id_* 2>&1`;
-`rm -f /tmp/$to_userid/.ssh/* 2>&1`;
-rmdir(\"/tmp/$to_userid/.ssh\");
-rmdir(\"/tmp/$to_userid\");";
-    close FILE;
-    chmod 0744, "$home/.ssh/copy.perl";
+ #   \$cmd = \"mkdir -p \$dest_dir\";
+  #  system(\"\$cmd\");
+   # chmod 0700, \$dest_dir;
+#}
+#`cat /tmp/$to_userid/.ssh/authorized_keys >> \$home/.ssh/authorized_keys 2>&1`;
+#`cat /tmp/$to_userid/.ssh/authorized_keys2 >> \$home/.ssh/authorized_keys2 2>&1`;
+#`cp /tmp/$to_userid/.ssh/id_rsa  \$home/.ssh/id_rsa 2>&1`;
+#`cp /tmp/$to_userid/.ssh/id_dsa  \$home/.ssh/id_dsa 2>&1`;
+#`chmod 0600 \$home/.ssh/id_* 2>&1`;
+#`rm -f /tmp/$to_userid/.ssh/* 2>&1`;
+#rmdir(\"/tmp/$to_userid/.ssh\");
+#rmdir(\"/tmp/$to_userid\");";
+ #   close FILE;
+ #   chmod 0744, "$home/.ssh/copy.perl";
+
+
+#  Replace the perl script with a shell script
+#  Shell is needed because the nodes may not have Perl installed
+    open(FILE, ">$home/.ssh/copy.sh")
+      or die "cannot open file $home/.ssh/copy.sh\n";
+    print FILE "#!/bin/sh
+umask 0077
+home=`egrep \"^$to_userid\" /etc/passwd | cut -f6 -d :`
+dest_dir=\"\$home/.ssh\"
+mkdir -p \$dest_dir
+cat /tmp/$to_userid/.ssh/authorized_keys >> \$home/.ssh/authorized_keys 2>&1
+cat /tmp/$to_userid/.ssh/authorized_keys2 >> \$home/.ssh/authorized_keys2 2>&1
+cp /tmp/$to_userid/.ssh/id_rsa  \$home/.ssh/id_rsa 2>&1
+cp /tmp/$to_userid/.ssh/id_dsa  \$home/.ssh/id_dsa 2>&1
+chmod 0600 \$home/.ssh/id_* 2>&1
+rm -f /tmp/$to_userid/.ssh/* 2>&1
+rmdir \"/tmp/$to_userid/.ssh\"
+rmdir \"/tmp/$to_userid\"";
+
+    close FILE;
+    chmod 0744, "$home/.ssh/copy.sh";
 
-    #  TODO build the shell copy script in $HOME/.ssh/copy.sh
-    #open(FILE, ">$home/.ssh/copy.sh")
-    #  or die "cannot open file $home/.ssh/copy.sh\n";
-    #print FILE "#!/bin/sh";
-    #close FILE;
-    #chmod 0744, "$home/.ssh/copy.sh";
 
     if ($from_userid eq "root")
     {
@@ -1226,7 +1242,7 @@ rmdir(\"/tmp/$to_userid\");";
         if ($to_userid eq "root")
         {
 
-            my $cmd = " cp $home/.ssh/copy.perl $SSHdir/copy.perl";
+            my $cmd = " cp $home/.ssh/copy.sh $SSHdir/copy.sh";
             xCAT::Utils->runcmd($cmd, 0);
             my $rsp = {};
             if ($::RUNCMD_RC != 0)
@@ -1297,7 +1313,7 @@ rmdir(\"/tmp/$to_userid\");";
 
 =head3    cpSSHFiles
 
-        Copies the ssh keyfiles and the copy perl script into
+        Copies the ssh keyfiles and the copy  script into
 		/install/postscripts/_ssh. and the $HOME/.ssh directory of
                 userid
 
diff --git a/xCAT-server/sbin/remoteshell.expect b/xCAT-server/sbin/remoteshell.expect
index 609a98d1f..0d834bde8 100644
--- a/xCAT-server/sbin/remoteshell.expect
+++ b/xCAT-server/sbin/remoteshell.expect
@@ -310,9 +310,7 @@ if { [llength $argv] != 0 } {
 						exec /bin/kill $pid
 					}
 				}
-				set pid [ spawn $scp  $directory/copy.perl $to_userid\@$node:/tmp/$to_userid/.ssh ] 
-				set pid [ spawn $scp  $directory/copy.perl $to_userid\@$node:/tmp/$to_userid/.ssh ] 
-				set pid [ spawn $scp  $directory/copy.perl $to_userid\@$node:/tmp/$to_userid/.ssh ] 
+				set pid [ spawn $scp  $directory/copy.sh $to_userid\@$node:/tmp/$to_userid/.ssh ] 
 				expect {
 					"Are you sure you want to continue connecting (yes/no)?" {
 						send "yes\r"
@@ -326,7 +324,7 @@ if { [llength $argv] != 0 } {
 						exec /bin/kill $pid
 					}
 				}
-				set pid [ spawn $remoteshell $node -l $to_userid /tmp/$to_userid/.ssh/copy.perl ]
+				set pid [ spawn $remoteshell $node -l $to_userid /tmp/$to_userid/.ssh/copy.sh ]
 				expect {
 					"Are you sure you want to continue connecting (yes/no)?" {
 						send "yes\r"