bootstrap: Add lshw package (also in fuel-mirror).

[armband.git] / patches / fuel-agent / 0001-Use-qemu-debootstrap-for-image-creation.patch

diff --git a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
index 28ef2cf..6f28d8a 100644 (file)
--- a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
+++ b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
@@ -20,9 +20,7 @@ diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/b
 index ca2d3e1..b0d410d 100644
 --- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/build.py
 +++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/build.py
-@@ -166,6 +166,14 @@ class BuildCommand(command.Command):
-                  " files",
-             action='append'
+@@ -166,4 +166,12 @@ class BuildCommand(command.Command):
          )
 +        parser.add_argument(
 +            '--target_arch',
@@ -36,7 +34,7 @@ index ca2d3e1..b0d410d 100644
  
      def take_action(self, parsed_args):
 diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py
-index 0219961..1387cf9 100644
+index 0219961..6e60fb8 100644
 --- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py
 +++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py
 @@ -172,7 +172,8 @@ def make_bootstrap(data):
@@ -44,7 +42,7 @@ index 0219961..1387cf9 100644
      LOG.info("Try to build image with data:\n%s", yaml.safe_dump(bootdata))
  
 -    opts = ['--data_driver', 'bootstrap_build_image']
-+    opts = ['--data_driver', 'bootstrap_build_image', 
++    opts = ['--data_driver', 'bootstrap_build_image',
 +            '--target_arch', data['target_arch']]
      if data.get('image_build_dir'):
          opts.extend(['--image_build_dir', data['image_build_dir']])
@@ -66,8 +64,7 @@ diff --git a/fuel_agent/manager.py b/fuel_agent/manager.py
 index 15cc5d8..f613aef 100644
 --- a/fuel_agent/manager.py
 +++ b/fuel_agent/manager.py
-@@ -18,6 +18,7 @@ import shutil
- import signal
+@@ -18,5 +18,6 @@ import shutil
  
  from oslo_config import cfg
 +from oslo_config import types
@@ -155,6 +152,3 @@ index 5c37600..a43f693 100644
  Requires:    xz
  Requires:    coreutils
  Requires:    psmisc
--- 
-1.9.1
-