arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Fix problem where .ssh was excluded in esxi images

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7178 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-08-20 15:12:38 +00:00
parent 9b06c9ec4b
commit 54f23bbb00
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/esx.pm
View File

@ -2919,7 +2919,9 @@ sub makecustomizedmod {
if (-e "$::XCATROOT/share/xcat/netboot/esxi/xcatsplash") {
copy( "$::XCATROOT/share/xcat/netboot/esxi/xcatsplash",$tempdir."/etc/vmware/welcome");
}
my $dossh=0;
if (-r "/root/.ssh/id_rsa.pub") {
$dossh=1;
my $umask = umask(0077);#don't remember if dropbear is picky, but just in case
mkpath($tempdir."/.ssh");
copy("/root/.ssh/id_rsa.pub",$tempdir."/.ssh/authorized_keys");
@ -2936,7 +2938,11 @@ sub makecustomizedmod {
if (-e "$dest/mod.tgz") {
unlink("$dest/mod.tgz");
}
system("tar czf $dest/mod.tgz *");
if ($dossh) {
system("tar czf $dest/mod.tgz * .ssh");
} else {
system("tar czf $dest/mod.tgz *");
}
chdir($dir);
rmtree($tempdir);
return 1;