diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 3ad48c961..de0ac6eb8 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -653,6 +653,8 @@ sub addnet
         }
         push @netent, "    if option client-architecture = 00:00  { #x86\n";
         push @netent, "      filename \"pxelinux.0\";\n";
+        push @netent, "    else if option vendor-class-identifier = \"Etherboot-5.4\"  { #x86\n";
+        push @netent, "      filename \"pxelinux.0\";\n";
         push @netent,
           "    } else if option client-architecture = 00:02 { #ia64\n ";
         push @netent, "      filename \"elilo.efi\";\n";
diff --git a/xCAT-server/lib/xcat/plugins/xen.pm b/xCAT-server/lib/xcat/plugins/xen.pm
index f30cdca5e..0b28c347a 100644
--- a/xCAT-server/lib/xcat/plugins/xen.pm
+++ b/xCAT-server/lib/xcat/plugins/xen.pm
@@ -97,7 +97,7 @@ sub build_diskstruct {
         my $disklocs=$vmhash->{$node}->[0]->{storage};
         my @locations=split /\|/,$disklocs;
         foreach (@locations) {
-            $currdev='sd'.$suffixes[$suffidx++];
+            $currdev='hd'.$suffixes[$suffidx++];
             $diskhash->{type}='file';
             $diskhash->{source}->{file}=$_; #"/vms/$node";
             $diskhash->{target}->{dev}=$currdev;