Fix various 'strict' issues in windows.pm
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15104 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		@@ -1,5 +1,6 @@
 | 
			
		||||
# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 | 
			
		||||
package xCAT_plugin::windows;
 | 
			
		||||
use strict;
 | 
			
		||||
BEGIN
 | 
			
		||||
{
 | 
			
		||||
  $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
 | 
			
		||||
@@ -84,6 +85,7 @@ sub mkimage {
 | 
			
		||||
    unless (-d "$installroot/autoinst") {
 | 
			
		||||
        mkpath "$installroot/autoinst";
 | 
			
		||||
    }
 | 
			
		||||
    my $ent;
 | 
			
		||||
    foreach $node (@nodes) {
 | 
			
		||||
        $ent = $oshash->{$node}->[0];
 | 
			
		||||
        unless ($ent->{arch} and $ent->{profile})
 | 
			
		||||
@@ -156,6 +158,7 @@ sub winshell {
 | 
			
		||||
    my $oshash = $ostab->getNodesAttribs(\@nodes,['profile','arch']);
 | 
			
		||||
    my $vpdtab = xCAT::Table->new('vpd');
 | 
			
		||||
    my $vpdhash = $vpdtab->getNodesAttribs(\@nodes,['uuid']);
 | 
			
		||||
    my $shandle;
 | 
			
		||||
    foreach $node (@nodes) {
 | 
			
		||||
        open($shandle,">","$installroot/autoinst/$node.cmd");
 | 
			
		||||
        print $shandle $script;
 | 
			
		||||
@@ -297,6 +300,7 @@ sub mkinstall
 | 
			
		||||
                           open($bootmgr,">$tftpdir/bootm32.exe");
 | 
			
		||||
                           binmode($origmgr);
 | 
			
		||||
                           binmode($bootmgr);
 | 
			
		||||
		           my @data = <$origmgr>;
 | 
			
		||||
                           foreach (@data) {
 | 
			
		||||
                               s/(\\.B.o.o.t.\\.B.)C(.)D/${1}3${2}2/; # 16 bit encoding... cheat
 | 
			
		||||
                               print $bootmgr $_;
 | 
			
		||||
@@ -516,9 +520,10 @@ sub copycd
 | 
			
		||||
        #If they say to call it something other than win<something>, give up?
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
    my $darch;
 | 
			
		||||
    if (-d $mntpath . "/sources/6.0.6000.16386_amd64" and -r $mntpath . "/sources/install.wim")
 | 
			
		||||
    {
 | 
			
		||||
        $darch = x86_64;
 | 
			
		||||
        $darch = "x86_64";
 | 
			
		||||
        unless ($distname) {
 | 
			
		||||
            $distname = "win2k8";
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user