Sync

debian/changelog

@@ -1,10 +1,22 @@
-xen-tools (3.9-4) unstable; urgency=medium
+xen-tools (3.9-5) unstable; urgency=medium
 
   - Record the ARCH for RPM-based distros.
     (Closes: #475125)
   - Abort if the generated configuration file already exists.
     (Closes: #499475)
 
+ -- Steve Kemp <skx@debian.org>  Mon, 13 Oct 2008 19:20:21 +0000
+
+xen-tools (3.9-4) unstable; urgency=high
+
+  * Changed two defaults in xen-tools.conf to conform
+    to the defaults used by the xen packages:
+      + serial_device: tty1 -> hvc0
+      + disk_device:   sda  -> xvda
+
+  * Priority High because of RC bug. (closes: #499282)
+
+ -- Radu Spineanu <radu@debian.org>  Tue, 30 Sep 2008 02:02:21 +0300
 
 xen-tools (3.9-3) unstable; urgency=medium
 

etc/xen-tools.conf

@@ -248,17 +248,17 @@ reiser_options = defaults
 
 
 #
-#  If you're using a newer version of the Xen guest kernel you will
-# need to make sure that you use 'xvc0' for the guest serial device,
+#  If you're using the lenny or later version of the Xen guest kernel you will
+# need to make sure that you use 'hvc0' for the guest serial device,
 # and 'xvdX' instead of 'sdX' for serial devices.
 #
 #  You may specify the things to use here:
 #
-# serial_device = tty1 #default
-# serial_device = xvc0
+# serial_device = hvc0 #default
+# serial_device = tty1
 #
-# disk_device = sda  #default
-# disk_device = xvda
+# disk_device = xvda #default
+# disk_device = sda
 #