Sync

(Closes: #499475)

bin/xen-create-image

@@ -1802,6 +1802,18 @@ EOF
         exit 127;
     }
 
+    #
+    #  Already present?
+    #
+    my $cfg =
+      $CONFIG{'output'} . "/" . $CONFIG{'hostname'} . $CONFIG{'extension'};
+    if ( -e $cfg )
+    {
+        print "Configuration file already exists; $cfg\n";
+        print "Aborting\n";
+        exit 127;
+    }
+
 }
 
 
@@ -2110,9 +2122,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;
 }
 
 

debian/changelog

@@ -1,3 +1,23 @@
+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
 
   - Ensure that Fedora guests get /dev/pts mounted.

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/15-setup-arch

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Record arch, if present.
+#
+if [ -d $prefix/etc/rpm ]; then
+
+    logMessage Found /etc/rpm
+
+    #
+    #  If i386 then record this
+    #
+    if [ "$arch" = "i386" ]; then
+        echo "i386-fedora-linux-gnu" >> $prefix/etc/rpm/platform
+    fi
+else
+
+    logMessage Failed to find /etc/rpm
+
+fi
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
+

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/15-setup-arch

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Record arch, if present.
+#
+if [ -d $prefix/etc/rpm ]; then
+
+    logMessage Found /etc/rpm
+
+    #
+    #  If i386 then record this
+    #
+    if [ "$arch" = "i386" ]; then
+        echo "i386-fedora-linux-gnu" >> $prefix/etc/rpm/platform
+    fi
+else
+
+    logMessage Failed to find /etc/rpm
+
+fi
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
+

hooks/centos-5/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/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/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/50-setup-hostname

@@ -90,7 +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

hooks/fedora-core-6/15-setup-arch

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Record arch, if present.
+#
+if [ -d $prefix/etc/rpm ]; then
+
+    logMessage Found /etc/rpm
+
+    #
+    #  If i386 then record this
+    #
+    if [ "$arch" = "i386" ]; then
+        echo "i386-fedora-linux-gnu" >> $prefix/etc/rpm/platform
+    fi
+else
+
+    logMessage Failed to find /etc/rpm
+
+fi
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
+

hooks/fedora-core-6/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/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

t/modules.sh

@@ -25,7 +25,7 @@ use Test::More qw( no_plan );
 EOF
 
 
-for i in `rgrep '^use ' .. | grep -v Expect | grep -v Xen:: | grep -v Moose | awk '{print $2}' | tr -d 
+for i in `rgrep '^use ' .. | grep -v Expect | grep -v POSIX | grep -v Xen:: | grep -v Moose | awk '{print $2}' | tr -d 
 \;\(\) | sort | uniq`; \
     do \
      echo "BEGIN{ use_ok( '$i' ); }"; \

t/modules.t

@@ -58,10 +58,6 @@ BEGIN{ use_ok( 'Pod::Usage' ); }
 require_ok( 'Pod::Usage' );
 
 
-BEGIN{ use_ok( 'POSIX' ); }
-require_ok( 'POSIX' );
-
-
 BEGIN{ use_ok( 'strict' ); }
 require_ok( 'strict' );