From c2373953d35eb957b23cf193e729a055664f4c37 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Mon, 2 Apr 2018 20:38:55 -0400
Subject: [PATCH 1/2] ADD NODE name to the /opt/xcat/xcatinfo for statelite
 image

---
 xCAT/postscripts/xcatdsklspost | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost
index 4113667db..083320d6b 100755
--- a/xCAT/postscripts/xcatdsklspost
+++ b/xCAT/postscripts/xcatdsklspost
@@ -692,6 +692,12 @@ if [ $? -eq 0 ]; then
 else
     echo "USEFLOWCONTROL=$new_fc" >> /opt/xcat/xcatinfo
 fi
+grep 'NODE' /opt/xcat/xcatinfo > /dev/null  2>&1
+if [ $? -eq 0 ]; then
+    sed -i "s/NODE=.*/NODE=$NODE/" /opt/xcat/xcatinfo
+else
+    echo "NODE=$NODE" >> /opt/xcat/xcatinfo
+fi
 
 # Store the SERVICEGROUP into the xcatinfo file for node deployment, and also for updatenode -s
 if [ $NODE_DEPLOYMENT -eq 1 ] || [ "$MODE" = "1" ]; then

From 302e80dc9384ed14d4aa5bfe275608807a638c2a Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Tue, 3 Apr 2018 15:34:12 -0400
Subject: [PATCH 2/2] Add Image name/uuid/timestamp to /opt/xcat/xcatinfo

---
 xCAT-server/lib/xcat/plugins/statelite.pm | 12 ++++++++++++
 xCAT/postscripts/xcatdsklspost            | 12 ++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/statelite.pm b/xCAT-server/lib/xcat/plugins/statelite.pm
index e6f2e5e2d..2d76a55b8 100644
--- a/xCAT-server/lib/xcat/plugins/statelite.pm
+++ b/xCAT-server/lib/xcat/plugins/statelite.pm
@@ -531,6 +531,18 @@ sub process_request {
         # before packaging the image
         system("umount $rootimg_dir/proc");
 
+        #put the image name, uuid and timestamp into diskless image when it is packed.
+        $callback->({ data => ["add image info to xcatinfo file"] });
+        `echo IMAGENAME="'$imagename'" > $rootimg_dir/opt/xcat/xcatinfo`;
+
+        my $uuid = `uuidgen`;
+        chomp $uuid;
+        `echo IMAGEUUID="'$uuid'" >> $rootimg_dir/opt/xcat/xcatinfo`;
+
+        my $timestamp = `date`;
+        chomp $timestamp;
+        `echo TIMESTAMP="'$timestamp'" >> $rootimg_dir/opt/xcat/xcatinfo`;
+
         my $verb = "Packing";
 
         my $temppath;
diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost
index 083320d6b..4ec93d7aa 100755
--- a/xCAT/postscripts/xcatdsklspost
+++ b/xCAT/postscripts/xcatdsklspost
@@ -384,12 +384,6 @@ else # for common mode  MODE=1,2,3,5 (updatenode,moncfg,node deployment)
     if [ -z "$NODE" ]; then
          NODE=`hostname -s`
     fi
-    grep 'NODE' /opt/xcat/xcatinfo > /dev/null  2>&1
-    if [ $? -eq 0 ]; then
-        sed -i "s/NODE=.*/NODE=$NODE/" /opt/xcat/xcatinfo
-    else
-        echo "NODE=$NODE" >> /opt/xcat/xcatinfo
-    fi
 
     downloaded=0;  #  have not downloaded the postscripts
     # try the -m/-M input (P_SIP) if it is specified,
@@ -692,6 +686,11 @@ if [ $? -eq 0 ]; then
 else
     echo "USEFLOWCONTROL=$new_fc" >> /opt/xcat/xcatinfo
 fi
+
+# Add Node name to /opt/xcat/xcatinfo
+if [ -z "$NODE" ]; then
+    NODE=`hostname -s`
+fi
 grep 'NODE' /opt/xcat/xcatinfo > /dev/null  2>&1
 if [ $? -eq 0 ]; then
     sed -i "s/NODE=.*/NODE=$NODE/" /opt/xcat/xcatinfo
@@ -699,6 +698,7 @@ else
     echo "NODE=$NODE" >> /opt/xcat/xcatinfo
 fi
 
+
 # Store the SERVICEGROUP into the xcatinfo file for node deployment, and also for updatenode -s
 if [ $NODE_DEPLOYMENT -eq 1 ] || [ "$MODE" = "1" ]; then
     sn_group=`grep '^SERVICEGROUP' /$xcatpost/mypostscript |cut -d= -f2 | tr -d \'\"`