Finish changelog entry

.hgignore

@@ -1,4 +0,0 @@
-(^|/)CVS($|/)
-(^|/)\.hg($|/)
-(^|/)\.hgtags($|/)
-ChangeLog

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;
 }
 
 
@@ -2479,9 +2479,17 @@ sub createLoopbackImages
             $image_cmd = "dd if=/dev/zero of=$disk bs=$size count=1024";
         }
 
+        # Set the umask so that the images are not world readable.
+        my $oldumask = umask;
+        umask(0077);
+
+        # run the image creation command
         runCommand( $image_cmd );
         logprint( "Done\n" );
 
+        # Reset the umask to the previous value
+        umask($oldumask);
+
         if ( ! -e $disk )
         {
             logprint( "The partition image creation failed to create $disk.\n" );

debian/changelog

@@ -1,3 +1,41 @@
+xen-tools (3.9-4+lenny1) stable; urgency=low
+
+  * Set umask to 0077 before creating disk images (Closes: #548909)
+    (Cherry-picked dfbf591 from master branch)
+
+ -- Axel Beckert <abe@debian.org>  Fri, 19 Nov 2010 20:26:43 +0100
+
+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
+
+  - 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 <skx@debian.org>  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
+    Debian & Ubuntu guests will correctly setup teh broadcast address.
+
+ -- Steve Kemp <skx@debian.org>  Wed, 20 Feb 2007 21:22:23 +0000
+
 xen-tools (3.9-1) unstable; urgency=low
 
   - general:

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
+#  If you're using the lenny or later version of the Xen guest kernel you will
-# need to make sure that you use 'xvc0' for the guest serial device,
+# 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 = hvc0 #default
-# serial_device = xvc0
+# serial_device = tty1
 #
-# disk_device = sda  #default
+# disk_device = xvda #default
-# disk_device = xvda
+# disk_device = sda
 #
 
 

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
 
 
         #

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
 
 
         #

hooks/common.sh

@@ -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 "$@"
 
 }
 

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
 
 
         #

hooks/debian/40-setup-networking

@@ -82,7 +82,7 @@ setupStaticNetworking ()
     #
     bcast='';
     if [ ! -z "${broadcast}" ]; then
-      bcast=' broadcast ${broadcast}'
+      bcast=" broadcast ${broadcast}"
     fi
 
     #

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

hooks/edgy/40-setup-networking

@@ -72,7 +72,7 @@ setupStaticNetworking ()
     #
     bcast='';
     if [ ! -z "${broadcast}" ]; then
-      bcast=' broadcast ${broadcast}'
+      bcast=" broadcast ${broadcast}"
     fi
 
     #

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

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

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

@@ -64,6 +64,7 @@ cat <<E_O_FSTAB > ${prefix}/etc/fstab
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
 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}}\""

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