From 30abf2466bd9dc2e4697b85fdc02558edec9abeb Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 27 Apr 2011 15:09:24 +0000
Subject: [PATCH] vSphere 5 uses vpxuser instead of vimuser, adjust accordingly

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9416 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/esx.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index ded0c8ba0..da3d08b54 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -3834,7 +3834,12 @@ sub  makecustomizedmod {
     open($shadow,">",$tempdir."/etc/shadow");
     $password = crypt($password,'$1$'.xCAT::Utils::genpassword(8));
     my $dayssince1970 = int(time()/86400); #Be truthful about /etc/shadow
-    my @otherusers = qw/nobody nfsnobody dcui daemon vimuser/;
+    my @otherusers = qw/nobody nfsnobody dcui daemon/;
+    if ($osver =~ /esxi4/) {
+      push @otherusers,"vimuser";
+    } elsif ($osver =~ /esxi5/) {
+      push @otherusers,"vpxuser";
+    }
     print $shadow "root:$password:$dayssince1970:0:99999:7:::\n";
     foreach (@otherusers) {
         print $shadow "$_:*:$dayssince1970:0:99999:7:::\n";