Merge branch '4.3/886'

operation/configure_bootloader_cnf.sh

@@ -63,10 +63,16 @@ options:
 
 configure_elilo_cnf()
 {
-	local root_dev
-	root_dev="/dev/$ROOT_PARTITION"
- 	sed -i "s@root=@root=$root_dev@g" $ELILO_CNF
-    sed -i -e "/initrd=.*/i\  append=\"$KPARAMETER\""  $ELILO_CNF
+      local root_dev 
+      by_uuid=$(get_disk_sym $ROOT_PARTITION "by-uuid")
+      if [ -n "$by_uuid" ];then
+          root_dev="UUID=$(echo $by_uuid|sed 's/.*\///')"
+          sed -i -e "s@^root=@append=\"$KPARAMETER root=UUID=$root_dev\"@"  $ELILO_CNF
+      else
+          root_dev="/dev/$ROOT_PARTITION"
+          sed -i "s@root=@root=$root_dev@g" $ELILO_CNF
+          sed -i -e "/initrd=.*/i\  append=\"$KPARAMETER\""  $ELILO_CNF
+      fi
 }
 
 configure_grub_cnf ()