From 262e8eed5953182abb2062c7f2f3a4f71df95d61 Mon Sep 17 00:00:00 2001
From: Gerben Meijer <infernix@gmail.com>
Date: Mon, 10 Aug 2015 17:07:20 +0200
Subject: [PATCH] Revert "Use per device boot order when boot_order is set"

This reverts commit dc2f5cb4aa17da3a301b38171b9ada14ad6f7a41.
---
 .../action/create_network_interfaces.rb                |  1 -
 lib/vagrant-libvirt/templates/domain.xml.erb           | 10 +++++-----
 lib/vagrant-libvirt/templates/interface.xml.erb        |  5 -----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/vagrant-libvirt/action/create_network_interfaces.rb b/lib/vagrant-libvirt/action/create_network_interfaces.rb
index 6ed1fd8..eede1ac 100644
--- a/lib/vagrant-libvirt/action/create_network_interfaces.rb
+++ b/lib/vagrant-libvirt/action/create_network_interfaces.rb
@@ -20,7 +20,6 @@ module VagrantPlugins
 	        config = env[:machine].provider_config
 	        @nic_model_type = config.nic_model_type
           @nic_adapter_count = config.nic_adapter_count
-          @boot_order = config.boot_order
           @app = app
         end
 
diff --git a/lib/vagrant-libvirt/templates/domain.xml.erb b/lib/vagrant-libvirt/templates/domain.xml.erb
index 4908a91..2ac6f50 100644
--- a/lib/vagrant-libvirt/templates/domain.xml.erb
+++ b/lib/vagrant-libvirt/templates/domain.xml.erb
@@ -31,7 +31,12 @@
       <loader readonly='yes' type='rom'><%= @loader %></loader>
     <% end %>
     <% if @boot_order.count >= 1 %>
+      <% @boot_order.each do |b| %>
+        <boot dev='<%= b %>'/>
+      <% end %> 
       <bootmenu enable='yes'/>
+    <% else %>
+      <boot dev='hd' />
     <% end %>
     <kernel><%= @kernel %></kernel>
     <initrd><%= @initrd %></initrd>
@@ -49,11 +54,6 @@
       <source file='<%= @domain_volume_path %>'/>
       <%# we need to ensure a unique target dev -%>
       <target dev='vda' bus='<%= @disk_bus %>'/>
-      <% if @boot_order[0] == 'hd' %>
-        <boot order='1'/>
-      <% elsif @boot_order.count >= 1 %> 
-        <boot order='9'/>
-      <% end %>
     </disk>
 <%# additional disks -%>
 <% @disks.each do |d| -%>
diff --git a/lib/vagrant-libvirt/templates/interface.xml.erb b/lib/vagrant-libvirt/templates/interface.xml.erb
index 7086a7f..34ceccd 100644
--- a/lib/vagrant-libvirt/templates/interface.xml.erb
+++ b/lib/vagrant-libvirt/templates/interface.xml.erb
@@ -6,10 +6,5 @@
   <target dev='vnet<%= @iface_number %>'/>
   <alias name='net<%= @iface_number %>'/>
   <model type='<%=@model_type%>'/>
-  <% if @boot_order[0] == 'network' %>
-    <boot order='<%= @iface_number+1 %>'/>
-  <% elsif @boot_order.include?('network') %> 
-    <boot order='<%= @iface_number+2 %>'/>
-  <% end %>
 </interface>