Bug#652110: xen-tools: If the --ip option is passed multiple times only the last IP gets used.

[Brian Bennett]

Axel,

I also noticed that the config file created in /etc/xen only includes the first
IP. This will cause problems for anybody using the xen firewall.

Here's two additional small patches that will take care of that too.

First for xen-create-image:

--- xen-create-image.old        2011-12-15 15:56:53.000000000 -0800
+++ xen-create-image    2011-12-15 15:40:19.000000000 -0800
@@ -3990,6 +3990,12 @@
         $command .= " --admins=$CONFIG{'admins'}";
     }
 
+    #
+    #  Make sure the template gets a list of all IPs
+    #
+    $ENV{ 'IP_ADDRESSES' } = $IP_ADDRESSES;
+
+
     logprint("\nCreating Xen configuration file\n");
     runCommand($command);
     logprint("Done\n");



And now the template:

--- xm.tmpl.old 2010-10-05 15:26:00.000000000 -0700
+++ xm.tmpl     2011-12-15 15:38:39.000000000 -0800
@@ -135,7 +135,7 @@
       $br = ",bridge=$bridge"
     }
 
-    $OUT .= "vif         = [ 'ip=$ip1";
+    $OUT .= "vif         = [ 'ip=$IP_ADDRESSES";
     $OUT .= "$m";
     $OUT .= "$vn";
     $OUT .= "$br";

On Dec 14, 2011, at 2:08 PM, Axel Beckert wrote:
> Thanks! It's not perfect, but should do the trick.

smime.p7s
Description: S/MIME cryptographic signature