From c85144de0f61b23d33874d48b2d2eadeefd2e859 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Mon, 13 Oct 2008 19:23:15 +0100 Subject: [PATCH] Sync --- debian/changelog | 14 +++++++++++++- etc/xen-tools.conf | 12 ++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ae2d4c..4b286ca 100644 --- a/debian/changelog +++ b/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 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 Tue, 30 Sep 2008 02:02:21 +0300 xen-tools (3.9-3) unstable; urgency=medium diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index 7e44405..bb5d139 100644 --- a/etc/xen-tools.conf +++ b/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 #