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:
@@ -37,9 +75,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 <radu@debian.org>  Wed, 03 Oct 2007 00:39:58 +0300
@@ -149,8 +187,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 <radu@debian.org>  Wed,  6 Dec 2006 15:58:44 +0200
 
 xen-tools (3.0~beta1-1) unstable; urgency=low
@@ -158,7 +196,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 <radu@debian.org>  Mon,  4 Dec 2006 16:55:31 +0200
@@ -181,7 +219,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 <radu@debian.org>  Wed,  8 Nov 2006 00:35:40 +0200
 
@@ -203,13 +241,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 <radu@debian.org>  Sat, 14 Oct 2006 02:21:25 +0300
 
 xen-tools (2.7-1) unstable; urgency=low
 
-  * New upstream release 
+  * New upstream release
 
  -- Radu Spineanu <radu@debian.org>  Sat, 14 Oct 2006 02:16:20 +0300
 
@@ -270,7 +308,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)
@@ -312,7 +350,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)
@@ -363,7 +401,7 @@ xen-tools (2.0-1) unstable; urgency=low
     (Closes: #373800)
 
  -- Steve Kemp <skx@debian.org>  Tue, 20 Jun 2006 09:57:45 +0000
-  
+
 xen-tools (1.6-1) unstable; urgency=low
 
   * New upstream release (closes: #368983)
@@ -406,26 +444,26 @@ xen-tools (1.4-1) unstable; urgency=low
      (Closes: #363070)
   *  Added new option --initrd to specify the initial ramdisk.
      (Closes: #365500)
-  
+
  -- Steve Kemp <skx@debian.org>  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 <radu@debian.org>  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 <radu@debian.org>  Tue, 21 Feb 2006 01:28:28 +0200
 

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
 #
 
 

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

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

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

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