diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index d0e53090a..88d47a65e 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -393,8 +393,8 @@ sub subvars {
                      $partcontent .= "/tmp/partscript\n";
                   }else{
                      # Put the code to decode the preseed recipe file
-                     #$partcontent .= "python -c 'import base64; print base64.b64decode(open(\"/tmp/partscript.enc\",\"rb\").read())' >/tmp/partitioning\n";
-                     $partcontent .= "base64decode</tmp/partscript.enc >/tmp/partitioning\n";
+                     #$partcontent .= "python -c 'import base64; print base64.b64decode(open(\"/tmp/partscript.enc\",\"rb\").read())' >/tmp/partitionfile\n";
+                     $partcontent .= "base64decode</tmp/partscript.enc >/tmp/partitionfile\n";
                     
                   }
                   #replace the #XCA_PARTMAN_RECIPE_SCRIPT#
diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu b/xCAT-server/share/xcat/install/scripts/pre.ubuntu
index 0e0262595..1fc63dfb6 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu
+++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu
@@ -179,22 +179,22 @@ base64decode()
 }
 
 if [ -d /sys/firmware/efi ]; then
-    echo "ubuntu-efi ::" > /tmp/partitioning
-    echo "    512 512 1024 fat16" >> /tmp/partitioning
-    echo '    $iflabel{ gpt } $reusemethod{ } method{ efi } format{ }' >> /tmp/partitioning
-    echo "    ." >> /tmp/partitioning
+    echo "ubuntu-efi ::" > /tmp/partitionfile
+    echo "    512 512 1024 fat16" >> /tmp/partitionfile
+    echo '    $iflabel{ gpt } $reusemethod{ } method{ efi } format{ }' >> /tmp/partitionfile
+    echo "    ." >> /tmp/partitionfile
 else
-    echo "ubuntu-boot ::" > /tmp/partitioning
-    echo "100 50 100 ext3" >> /tmp/partitioning
-    echo '    $primary{ } $bootable{ } method{ format } format{ } use_filesystem{ } filesystem{ ext3 } mountpoint{ /boot }' >> /tmp/partitioning
-    echo "    ." >> /tmp/partitioning
+    echo "ubuntu-boot ::" > /tmp/partitionfile
+    echo "100 50 100 ext3" >> /tmp/partitionfile
+    echo '    $primary{ } $bootable{ } method{ format } format{ } use_filesystem{ } filesystem{ ext3 } mountpoint{ /boot }' >> /tmp/partitionfile
+    echo "    ." >> /tmp/partitionfile
 fi
-echo "500 10000 1000000000 ext3" >> /tmp/partitioning
-echo "    method{ format } format{ } use_filesystem{ } filesystem{ ext3 } mountpoint{ / }" >> /tmp/partitioning
-echo "    ." >> /tmp/partitioning
-echo "2048 512 300% linux-swap" >> /tmp/partitioning
-echo "    method{ swap } format{ }" >> /tmp/partitioning
-echo "    ." >> /tmp/partitioning
+echo "500 10000 1000000000 ext3" >> /tmp/partitionfile
+echo "    method{ format } format{ } use_filesystem{ } filesystem{ ext3 } mountpoint{ / }" >> /tmp/partitionfile
+echo "    ." >> /tmp/partitionfile
+echo "2048 512 300% linux-swap" >> /tmp/partitionfile
+echo "    method{ swap } format{ }" >> /tmp/partitionfile
+echo "    ." >> /tmp/partitionfile
 
 #XCA_PARTMAN_RECIPE_SCRIPT#
 #XCA_PARTMAN_DISK_SCRIPT#
diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64 b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
index 5ca50160f..45637333d 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
+++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
@@ -193,27 +193,27 @@ base64decode()
 }
 
 if [ -d /sys/firmware/efi ]; then
-    echo "ubuntu-efi ::" > /tmp/partitioning
-    echo "    512 512 1024 fat16" >> /tmp/partitioning
-    echo '    $iflabel{ gpt } $reusemethod{ } method{ efi } format{ }' >> /tmp/partitioning
-    echo "    ." >> /tmp/partitioning
+    echo "ubuntu-efi ::" > /tmp/partitionfile
+    echo "    512 512 1024 fat16" >> /tmp/partitionfile
+    echo '    $iflabel{ gpt } $reusemethod{ } method{ efi } format{ }' >> /tmp/partitionfile
+    echo "    ." >> /tmp/partitionfile
 else
-    echo "ubuntu-boot ::" > /tmp/partitioning
+    echo "ubuntu-boot ::" > /tmp/partitionfile
 
-    echo "8 1 1 prep" >> /tmp/partitioning
-    echo '    $primary{ } $bootable{ } method{ prep }' >> /tmp/partitioning
-    echo "    ." >> /tmp/partitioning
+    echo "8 1 1 prep" >> /tmp/partitionfile
+    echo '    $primary{ } $bootable{ } method{ prep }' >> /tmp/partitionfile
+    echo "    ." >> /tmp/partitionfile
 
-    #echo "100 50 100 ext4" >> /tmp/partitioning
-    #echo '    $primary{ } $bootable{ } method{ format } format{ } use_filesystem{ } filesystem{ ext4 } mountpoint{ /boot }' >> /tmp/partitioning
-    #echo "    ." >> /tmp/partitioning
+    #echo "100 50 100 ext4" >> /tmp/partitionfile
+    #echo '    $primary{ } $bootable{ } method{ format } format{ } use_filesystem{ } filesystem{ ext4 } mountpoint{ /boot }' >> /tmp/partitionfile
+    #echo "    ." >> /tmp/partitionfile
 fi
-echo "500 10000 1000000000 ext4" >> /tmp/partitioning
-echo "    method{ format } format{ } use_filesystem{ } filesystem{ ext4 } mountpoint{ / }" >> /tmp/partitioning
-echo "    ." >> /tmp/partitioning
-echo "2048 512 300% linux-swap" >> /tmp/partitioning
-echo "    method{ swap } format{ }" >> /tmp/partitioning
-echo "    ." >> /tmp/partitioning
+echo "500 10000 1000000000 ext4" >> /tmp/partitionfile
+echo "    method{ format } format{ } use_filesystem{ } filesystem{ ext4 } mountpoint{ / }" >> /tmp/partitionfile
+echo "    ." >> /tmp/partitionfile
+echo "2048 512 300% linux-swap" >> /tmp/partitionfile
+echo "    method{ swap } format{ }" >> /tmp/partitionfile
+echo "    ." >> /tmp/partitionfile
 
 
 #XCA_PARTMAN_RECIPE_SCRIPT#
diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.tmpl b/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
index 39398d6e5..bb784ca26 100644
--- a/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
+++ b/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
@@ -37,7 +37,7 @@ d-i partman-auto/method string regular
 d-i partman-lvm/device_remove_lvm boolean true
 d-i partman-md/device_remove_md boolean true
 
-#create the /tmp/partitioning based on the uefi or legacy bios 
+#create the /tmp/partitionfile based on the uefi or legacy bios 
 d-i partman/early_command string \
     set -x; \
     if [ -f /tmp/boot_disk ]; then \
@@ -63,7 +63,7 @@ d-i partman/early_command string \
         echo "/dev/$DEV" > /tmp/boot_disk; \
     fi; \
     debconf-set partman-auto/disk "$(cat /tmp/boot_disk)"
-d-i partman-auto/expert_recipe_file string /tmp/partitioning
+d-i partman-auto/expert_recipe_file string /tmp/partitionfile
 
 # This makes partman automatically partition without confirmation, provided
 # that you told it what to do using one of the methods above.
diff --git a/xCAT-server/share/xcat/install/ubuntu/service.tmpl b/xCAT-server/share/xcat/install/ubuntu/service.tmpl
index 7690cd96c..5561fb2e7 100644
--- a/xCAT-server/share/xcat/install/ubuntu/service.tmpl
+++ b/xCAT-server/share/xcat/install/ubuntu/service.tmpl
@@ -22,11 +22,12 @@ d-i netcfg/dhcp_timeout string 120
 #d-i mirror/suite string testing
 # Suite to use for loading installer components (optional).
 #d-i mirror/udeb/suite string testing
+ 
 
 # Use the following option to add additional boot parameters for the
 # installed system (if supported by the bootloader installer).
 # Note: options passed to the installer will be added automatically.
-d-i debian-installer/add-kernel-opts string #XCATVAR:PERSKCMDLINE# 
+d-i debian-installer/add-kernel-opts string #XCATVAR:PERSKCMDLINE#
 
 ### Partitioning
 # This creates a small /boot partition, suitable
@@ -36,9 +37,13 @@ d-i partman-auto/method string regular
 d-i partman-lvm/device_remove_lvm boolean true
 d-i partman-md/device_remove_md boolean true
 
-#create the /tmp/partitioning based on the uefi or legacy bios 
+#create the /tmp/partitionfile based on the uefi or legacy bios 
 d-i partman/early_command string \
     set -x; \
+    if [ -f /tmp/boot_disk ]; then \
+       debconf-set partman-auto/disk "$(cat /tmp/boot_disk)"; \
+       exit; \
+    fi; \
     rm /tmp/devs-with-boot 2>/dev/null || true; \
     for d in $(list-devices partition); do \
         mkdir -p /tmp/mymount; \
@@ -53,12 +58,12 @@ d-i partman/early_command string \
         head -n1 /tmp/devs-with-boot | egrep  -o '\S+[^0-9]' > /tmp/boot_disk; \
         rm /tmp/devs-with-boot 2>/dev/null || true; \
     else \
-        DEV=`ls /dev/disk/by-path/* -l | egrep -o '/dev.*sd[^0-9]$' | sort -t : -k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -g | head -n1 | egrep -o 'sd.*$'`; \
+        DEV=`ls /dev/disk/by-path/* -l | egrep -o '/dev.*[s|h|v]d[^0-9]$' | sort -t : -k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -g | head -n1 | egrep -o '[s|h|v]d.*$'`; \
         if [[ "$DEV" == "" ]]; then DEV="sda"; fi; \
         echo "/dev/$DEV" > /tmp/boot_disk; \
     fi; \
     debconf-set partman-auto/disk "$(cat /tmp/boot_disk)"
-d-i partman-auto/expert_recipe_file string /tmp/partitioning
+d-i partman-auto/expert_recipe_file string /tmp/partitionfile
 
 # This makes partman automatically partition without confirmation, provided
 # that you told it what to do using one of the methods above.
@@ -68,6 +73,7 @@ d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
 
+#XCA_PARTMAN_ADDITIONAL_CFG#
 
 ### Account setup 
 
@@ -137,3 +143,4 @@ d-i preseed/late_command string wget http://`cat /tmp/xcatserver`/install/autoin
      mount -o bind /sys /target/sys; \
      chroot /target /root/post.script; \
      cp /target/etc/network/interfaces /etc/network/interfaces
+