Use hvc0 and xvda devices by default, add --scsi option for sda names

hooks/centos-4/90-make-fstab

@@ -36,15 +36,19 @@ logMessage Filesystem options are ${options}
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/centos-5/90-make-fstab

@@ -37,15 +37,19 @@ logMessage Filesystem options are ${options}
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/dapper/90-make-fstab

@@ -33,15 +33,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/debian/90-make-fstab

@@ -32,15 +32,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/edgy/90-make-fstab

@@ -33,15 +33,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/fedora-core-6/90-make-fstab

@@ -36,15 +36,19 @@ logMessage Filesystem options are ${options}
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/gentoo/90-make-fstab

@@ -33,15 +33,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/intrepid/90-make-fstab

@@ -33,15 +33,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/karmic/90-make-fstab

@@ -33,15 +33,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`