From d80587803c970e85eb18c7bdab1f4049acbf08dc Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 6 Jul 2010 08:18:22 +0000
Subject: [PATCH] remove the un-used code from genimage, according to the
 defect 3019537

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6649 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/share/xcat/netboot/rh/genimage   | 16 ----------------
 xCAT-server/share/xcat/netboot/sles/genimage | 15 ---------------
 2 files changed, 31 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index f9fd5b5c4..f82cda0af 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -1137,22 +1137,6 @@ sub postscripts { # TODO: customized postscripts
         copy ("$installroot/postscripts/xcatdsklspost", "$rootimg_dir/opt/xcat/");
         chmod '0755', "$rootimg_dir/opt/xcat/xcatdsklspost";
     }
-
-   if (-d "$installroot/postscripts/hostkeys") {
-      for my $key (<$installroot/postscripts/hostkeys/*key>) {
-         copy ($key,"$rootimg_dir/etc/ssh/");
-      }
-      chmod 0600,</$rootimg_dir/etc/ssh/*key>;
-   }
-   if (-d "/$installroot/postscripts/.ssh") {
-      mkpath("/$rootimg_dir/root/.ssh");
-      chmod(0700,"/$rootimg_dir/root/.ssh/");
-      for my $file (</$installroot/postscripts/.ssh/*>) {
-         copy ($file,"/$rootimg_dir/root/.ssh/");
-      }
-      chmod(0600,</$rootimg_dir/root/.ssh/*>);
-   }
-
 }
 
 sub generic_post { #This function is meant to leave the image in a state approximating a normal install
diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index db9b78886..23f800034 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -1173,21 +1173,6 @@ sub postscripts { # TODO: customized postscripts
         #system("$XCATROOT/share/xcat/netboot/add-on/statelite/add_passwd $rootimg_dir");
         #system("$XCATROOT/share/xcat/netboot/add-on/statelite/add_ssh $rootimg_dir");
     }
-   if (-d "$installroot/postscripts/hostkeys") {
-      for my $key (<$installroot/postscripts/hostkeys/*key>) {
-         copy ($key,"$rootimg_dir/etc/ssh/");
-      }
-      chmod 0600,<$rootimg_dir/etc/ssh/*key>;
-   }
-   if (-d "/$installroot/postscripts/.ssh") {
-      mkpath("$rootimg_dir/root/.ssh");
-      chmod(0700,"$rootimg_dir/root/.ssh/");
-      for my $file (</$installroot/postscripts/.ssh/*>) {
-         copy ($file,"$rootimg_dir/root/.ssh/");
-      }
-      chmod(0600,<$rootimg_dir/root/.ssh/*>);
-   }
-
 }
 
 sub generic_post { #This function is meant to leave the image in a state approximating a normal install