diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm
index 94feea492..cc025b6a2 100644
--- a/xCAT-server/lib/perl/xCAT/Postage.pm
+++ b/xCAT-server/lib/perl/xCAT/Postage.pm
@@ -228,7 +228,7 @@ sub makescript {
 	}
 
   if (!$nodesetstate) { $nodesetstate=getnodesetstate($node);}
-  push @scriptd, "NODESETSTATE=".$nodesetstate."\n";
+  push @scriptd, "NODESETSTATE=\"".$nodesetstate."\"\n";
   push @scriptd, "export NODESETSTATE\n";
 
   # set the UPDATENODE flag in the script, the default it 0, that means not in the updatenode process, xcatdsklspost and xcataixpost will set it to 1 in updatenode case
diff --git a/xCAT/postscripts/syncfiles b/xCAT/postscripts/syncfiles
index 1dd6283b3..cd9cb7668 100644
--- a/xCAT/postscripts/syncfiles
+++ b/xCAT/postscripts/syncfiles
@@ -18,9 +18,9 @@ if [[ $NOSYNCFILES -eq 1 ]]; then
 fi
 
 # do nothing for diskless deployment case because it is done in the image already
-if [ $NODESETSTATE = "netboot" -o \
-     $NODESETSTATE = "diskless" -o \
-     $NODESETSTATE = "dataless" ] 
+if [ "$NODESETSTATE" = "netboot" -o \
+     "$NODESETSTATE" = "diskless" -o \
+     "$NODESETSTATE" = "dataless" ] 
 then
   exit 0
 fi