[Xcat-commit] SF.net SVN: xcat:[8966] xcat-core/trunk/xCAT-server/lib/xcat/plugins/ anaconda.pm

[<mx...@us...>]

Revision: 8966
          http://xcat.svn.sourceforge.net/xcat/?rev=8966&view=rev
Author:   mxi1
Date:     2011-03-02 11:05:29 +0000 (Wed, 02 Mar 2011)

Log Message:
-----------
    for defect 3197146, if rootfstype is ramdisk, then the initial-stateless.gz file should be copied when nodeset command is running.

Modified Paths:
--------------
    xcat-core/trunk/xCAT-server/lib/xcat/plugins/anaconda.pm

Modified: xcat-core/trunk/xCAT-server/lib/xcat/plugins/anaconda.pm
===================================================================
--- xcat-core/trunk/xCAT-server/lib/xcat/plugins/anaconda.pm	2011-03-02 09:50:17 UTC (rev 8965)
+++ xcat-core/trunk/xCAT-server/lib/xcat/plugins/anaconda.pm	2011-03-02 11:05:29 UTC (rev 8966)
@@ -415,7 +415,11 @@
 	        }
             copy("$rootimgdir/kernel", "/$tftpdir/xcat/netboot/$osver/$arch/$profile/");
             if ($statelite) {
-                copy("$rootimgdir/initrd-statelite.gz", "/$tftpdir/xcat/netboot/$osver/$arch/$profile/");
+                if($rootfstype eq "ramdisk") {
+                    copy("$rootimgdir/initrd-stateless.gz", "/$tftpdir/xcat/netboot/$osver/$arch/$profile/");
+                } else {
+                    copy("$rootimgdir/initrd-statelite.gz", "/$tftpdir/xcat/netboot/$osver/$arch/$profile/");
+                }
             } else {
                 copy("$rootimgdir/initrd-stateless.gz", "/$tftpdir/xcat/netboot/$osver/$arch/$profile/");
             }
@@ -424,8 +428,14 @@
 
 
         if ($statelite) {
+            my $initrdloc = "/$tftpdir/xcat/netboot/$osver/$arch/$profile/";
+            if ($rootfstype eq "ramdisk") {
+                $initrdloc .= "initrd-stateless.gz";
+            } else {
+                $initrdloc .= "initrd-statelite.gz";
+            }
             unless ( -r "/$tftpdir/xcat/netboot/$osver/$arch/$profile/kernel"
-                    and -r "/$tftpdir/xcat/netboot/$osver/$arch/$profile/initrd-statelite.gz") {
+                    and -r $initrdloc ) {
                 $callback->({
                     error=>[qq{copying to /$tftpdir/xcat/netboot/$osver/$arch/$profile failed}],
                     errorcode=>[1]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.