From 3b427eebefa7811ffdffc694ba850fa8f1bc4752 Mon Sep 17 00:00:00 2001 From: daniceexi Date: Mon, 29 Jun 2009 09:08:14 +0000 Subject: [PATCH] roll back to the last version to remove the sync image implementation git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3653 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/netboot/rh/genimage | 13 ------------- xCAT-server/share/xcat/netboot/sles/genimage | 12 ------------ 2 files changed, 25 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage index d2b142505..dbcabfb2e 100755 --- a/xCAT-server/share/xcat/netboot/rh/genimage +++ b/xCAT-server/share/xcat/netboot/rh/genimage @@ -1,8 +1,4 @@ #!/usr/bin/env perl -BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; } -use lib "$::XCATROOT/lib/perl"; -use xCAT::Utils; - use File::Basename; use File::Path; use File::Copy; @@ -194,15 +190,6 @@ elsif (-x "$pathtofiles/$profile.postinstall") { mkinitrd(); -# sync fils to the rootimage -my $syncfile = xCAT::Utils->getsynclistfile(undef, $osver, $arch, $profile, "netboot"); -if (defined ($syncfile) && -f $syncfile - && -d "$installroot/netboot/$osver/$arch/$profile/rootimg") { - print "sync files from $syncfile to the $installroot/netboot/$osver/$arch/$profile/rootimg\n"; - `$::XCATROOT/bin/xdcp -i "$installroot/netboot/$osver/$arch/$profile/rootimg" -F $syncfile`; -} - - sub getlibs { my $file = shift; my $liblist = `chroot $installroot/netboot/$osver/$arch/$profile/rootimg ldd $file`; diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage index 12fe993f5..5add45608 100755 --- a/xCAT-server/share/xcat/netboot/sles/genimage +++ b/xCAT-server/share/xcat/netboot/sles/genimage @@ -1,8 +1,4 @@ #!/usr/bin/env perl -BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; } -use lib "$::XCATROOT/lib/perl"; -use xCAT::Utils; - use File::Basename; use File::Path; use File::Copy; @@ -249,14 +245,6 @@ if (($postinstall_filename) && (-x $postinstall_filename)) { mkinitrd(); -# sync fils to the rootimage -my $syncfile = xCAT::Utils->getsynclistfile(undef, $osver, $arch, $profile, "netboot"); -if (defined ($syncfile) && -f $syncfile - && -d "$installroot/netboot/$osver/$arch/$profile/rootimg") { - print "sync files from $syncfile to the $installroot/netboot/$osver/$arch/$profile/rootimg\n"; - `$::XCATROOT/bin/xdcp -i "$installroot/netboot/$osver/$arch/$profile/rootimg" -F $syncfile`; -} - sub getlibs { my $file = shift;