diff --git a/bin/xen-create-image b/bin/xen-create-image index 7464fef..3a7ab90 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -2072,7 +2072,7 @@ EOF # This makes it easy to mount parent folders first # (e.g. /var before /var/tmp) # - @PARTITIONS = sort { length $a->{'mountpoint'} cmp length $b->{'mountpoint'} } @PARTITIONS; + @PARTITIONS = sort { length $a->{'mountpoint'} <=> length $b->{'mountpoint'} } @PARTITIONS; } diff --git a/debian/changelog b/debian/changelog index 3d896c6..fe8bcbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +xen-tools (3.9-3) unstable; urgency=medium + + - Ensure that Fedora guests get /dev/pts mounted. + Thanks to Giovanni Biscuolo (Closes: #474919) + - Add the new hostnames to /etc/hosts on the dom0 in the correct order. + Thanks to Wolfgang Karall (Closes: #477775) + - Ensure that packages are remoed non-interactively for scripted stuff. + Thanks to Wolfgang Karall (Closes: #477629) + - Correctly handle custom partitioning systems. + Thanks to Stéphane AICARDI (Closes: #477334) + + -- Steve Kemp Wed, 20 Feb 2007 21:22:23 +0000 + xen-tools (3.9-2) unstable; urgency=high - Ensure that the hook scripts which setup networking details for @@ -44,9 +57,9 @@ xen-tools (3.8-1) unstable; urgency=low (Closes: #439233) * Use 'apt-get remove' rather than 'dpkg --purge' when removing packages in hooks. (Closes: #441981) - + [ Radu Spineanu ] - * debian/control: Roland Stigge and I switched maintainer places. + * debian/control: Roland Stigge and I switched maintainer places. * debian/control: Added Steve Kemp to Uploaders. -- Radu Spineanu Wed, 03 Oct 2007 00:39:58 +0300 @@ -156,8 +169,8 @@ xen-tools (3.0-1) unstable; urgency=low xen-tools (3.0~beta1-2) unstable; urgency=low - * Remove old symlinks and directories during preinst. (closes: #401834) - + * Remove old symlinks and directories during preinst. (closes: #401834) + -- Radu Spineanu Wed, 6 Dec 2006 15:58:44 +0200 xen-tools (3.0~beta1-1) unstable; urgency=low @@ -165,7 +178,7 @@ xen-tools (3.0~beta1-1) unstable; urgency=low * Development snapshot * Mention the --mac option in the man page. (closes: #399708) - * Set the locale version to 'C' to avoid perl warnings. + * Set the locale version to 'C' to avoid perl warnings. (closes: #399778) -- Radu Spineanu Mon, 4 Dec 2006 16:55:31 +0200 @@ -188,7 +201,7 @@ xen-tools (2.8-2) unstable; urgency=low xen-tools (2.8-1) unstable; urgency=low - * New upstream release + * New upstream release -- Radu Spineanu Wed, 8 Nov 2006 00:35:40 +0200 @@ -210,13 +223,13 @@ xen-tools (2.7-3) unstable; urgency=low xen-tools (2.7-2) unstable; urgency=low - * Fixed 2.6-2 changelog entry. + * Fixed 2.6-2 changelog entry. -- Radu Spineanu Sat, 14 Oct 2006 02:21:25 +0300 xen-tools (2.7-1) unstable; urgency=low - * New upstream release + * New upstream release -- Radu Spineanu Sat, 14 Oct 2006 02:16:20 +0300 @@ -277,7 +290,7 @@ xen-tools (2.3-1) unstable; urgency=high using a specific version of debootstrap. - Updated manpages to avoid word-wrapping. - Updated --noswap option such that a LVM swap volume isn't created. - - Reverted the usage of '--keep-debootstrap-dir' since that is a + - Reverted the usage of '--keep-debootstrap-dir' since that is a "recent" thing. Will switch to keeping a global logfile for error purposes. (Closes: #383589) @@ -319,7 +332,7 @@ xen-tools (2.2-2) unstable; urgency=low xen-tools (2.2-1) unstable; urgency=high * New upstream release, fixes several important bugs hence urgency=high. - - /etc/fstab creation generated correctly for reiserfs + - /etc/fstab creation generated correctly for reiserfs (Closes: #379023) (Closes: #379096) - --force works with xfs filesystems. (Closes: #377684) @@ -370,7 +383,7 @@ xen-tools (2.0-1) unstable; urgency=low (Closes: #373800) -- Steve Kemp Tue, 20 Jun 2006 09:57:45 +0000 - + xen-tools (1.6-1) unstable; urgency=low * New upstream release (closes: #368983) @@ -413,26 +426,26 @@ xen-tools (1.4-1) unstable; urgency=low (Closes: #363070) * Added new option --initrd to specify the initial ramdisk. (Closes: #365500) - + -- Steve Kemp Sun, 7 May 2006 14:43:43 +0000 xen-tools (1.3-1) unstable; urgency=low * New upstream release - + Ignore .dpkg-(new|old) files in the hooks directory + + Ignore .dpkg-(new|old) files in the hooks directory (closes: #357716) -- Radu Spineanu Sat, 15 Apr 2006 13:44:36 +0300 xen-tools (1.1-1) unstable; urgency=low - * New upstream release - + Disk devices are no longer created one unit bigger than asked + * New upstream release + + Disk devices are no longer created one unit bigger than asked (closes: #353155) + Populate /dev on the virtual server (closes: #352942) + Added --use-ide flag in case people want ide style device names (closes: #352937) - + xen.cfg is no longer broken when using LVM + + xen.cfg is no longer broken when using LVM -- Radu Spineanu Tue, 21 Feb 2006 01:28:28 +0200 diff --git a/hooks/centos-4/50-setup-hostname b/hooks/centos-4/50-setup-hostname index e63509b..02daf27 100755 --- a/hooks/centos-4/50-setup-hostname +++ b/hooks/centos-4/50-setup-hostname @@ -91,7 +91,7 @@ if [ -z "${dhcp}" ]; then logMessage Adding ${hostname} and ${name} to /etc/hosts on the host - echo "${ip1} ${name} ${hostname}" >> /etc/hosts + echo "${ip1} ${hostname} ${name}" >> /etc/hosts # diff --git a/hooks/centos-5/50-setup-hostname b/hooks/centos-5/50-setup-hostname index e63509b..02daf27 100755 --- a/hooks/centos-5/50-setup-hostname +++ b/hooks/centos-5/50-setup-hostname @@ -91,7 +91,7 @@ if [ -z "${dhcp}" ]; then logMessage Adding ${hostname} and ${name} to /etc/hosts on the host - echo "${ip1} ${name} ${hostname}" >> /etc/hosts + echo "${ip1} ${hostname} ${name}" >> /etc/hosts # diff --git a/hooks/common.sh b/hooks/common.sh index 5ce60df..618f004 100755 --- a/hooks/common.sh +++ b/hooks/common.sh @@ -12,7 +12,7 @@ # might develop. # # Steve -# -- +# -- # @@ -130,7 +130,7 @@ disableStartStopDaemon () chmod 755 "${daemonfile}" logMessage "start-stop-daemon disabled / made a stub." } - + # @@ -151,7 +151,7 @@ enableStartStopDaemon () fi } - + # @@ -182,7 +182,7 @@ removeDebianPackage () # # Purge the packages we've been given. # - chroot ${prefix} /usr/bin/apt-get remove --purge "$@" + chroot ${prefix} /usr/bin/apt-get remove --yes --purge "$@" } @@ -232,7 +232,7 @@ installGentooPackage () # Log our options # logMessage "Installing Gentoo package ${package} to prefix ${prefix}" - + logMessage "NOTE: Not doing anything - this is a stub - FIXME" } diff --git a/hooks/dapper/50-setup-hostname b/hooks/dapper/50-setup-hostname index bb1d413..1829909 100755 --- a/hooks/dapper/50-setup-hostname +++ b/hooks/dapper/50-setup-hostname @@ -91,7 +91,7 @@ if [ -z "${dhcp}" ]; then logMessage Adding ${hostname} and ${name} to /etc/hosts on the host - echo "${ip1} ${name} ${hostname}" >> /etc/hosts + echo "${ip1} ${hostname} ${name}" >> /etc/hosts # diff --git a/hooks/debian/50-setup-hostname b/hooks/debian/50-setup-hostname index f43d57a..32c5994 100755 --- a/hooks/debian/50-setup-hostname +++ b/hooks/debian/50-setup-hostname @@ -91,7 +91,7 @@ if [ -z "${dhcp}" ]; then logMessage Adding ${hostname} and ${name} to /etc/hosts on the host - echo "${ip1} ${name} ${hostname}" >> /etc/hosts + echo "${ip1} ${hostname} ${name}" >> /etc/hosts # # If we've updated the /etc/hosts file on the host machine diff --git a/hooks/edgy/50-setup-hostname b/hooks/edgy/50-setup-hostname index 8e8ba3a..f39da9f 100755 --- a/hooks/edgy/50-setup-hostname +++ b/hooks/edgy/50-setup-hostname @@ -90,8 +90,7 @@ if [ -z "${dhcp}" ]; then logMessage Adding ${hostname} and ${name} to /etc/hosts on the host - echo "${ip1} ${name} ${hostname}" >> /etc/hosts - + echo "${ip1} ${hostname} ${name}" >> /etc/hosts # # If we've updated the /etc/hosts file on the host machine # and there is an installation of dnsmasq installed then diff --git a/hooks/fedora-core-6/50-setup-hostname b/hooks/fedora-core-6/50-setup-hostname index e63509b..a445229 100755 --- a/hooks/fedora-core-6/50-setup-hostname +++ b/hooks/fedora-core-6/50-setup-hostname @@ -91,8 +91,7 @@ if [ -z "${dhcp}" ]; then logMessage Adding ${hostname} and ${name} to /etc/hosts on the host - echo "${ip1} ${name} ${hostname}" >> /etc/hosts - + echo "${ip1} ${hostname} ${name}" >> /etc/hosts # # If we've updated the /etc/hosts file on the host machine diff --git a/hooks/fedora-core-6/90-make-fstab b/hooks/fedora-core-6/90-make-fstab index 097e0cc..dbb00a8 100755 --- a/hooks/fedora-core-6/90-make-fstab +++ b/hooks/fedora-core-6/90-make-fstab @@ -64,6 +64,7 @@ cat < ${prefix}/etc/fstab # # proc /proc proc defaults 0 0 +devpts /dev/pts devpts rw,noexec,nosuid,gid=5,mode=620 0 0 E_O_FSTAB for part in `seq 1 ${NUMPARTITIONS}`; do eval "PARTITION=\"\${PARTITION${part}}\"" @@ -75,7 +76,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do x=$(( $x+1 )) done IFS="${OLDIFS}" - + case "${partdata2}" in xfs) has_xfs=1 @@ -84,7 +85,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do has_reiserfs=1 ;; esac - + if [ "${partdata2}" = "swap" ]; then echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab else diff --git a/hooks/gentoo/50-setup-hostname b/hooks/gentoo/50-setup-hostname index 076674c..3c48422 100755 --- a/hooks/gentoo/50-setup-hostname +++ b/hooks/gentoo/50-setup-hostname @@ -98,7 +98,7 @@ if [ -z "${dhcp}" ]; then logMessage Adding ${hostname} and ${name} to /etc/hosts on the host - echo "${ip1} ${name} ${hostname}" >> /etc/hosts + echo "${ip1} ${hostname} ${name}" >> /etc/hosts # # If we've updated the /etc/hosts file on the host machine