Rebase: p/fuel-agent: Patch context refresh.

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 96b0e63..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',
@@ -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

diff --git a/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch b/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
index 7f6d2c3..37017e1 100644 (file)
--- a/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
+++ b/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
@@ -35,8 +35,7 @@ index 6322a10..843c40b 100644
              if hasattr(bs_scheme, 'certs') and bs_scheme.certs:
                  bu.copy_update_certs(bs_scheme.certs, chroot)
              bu.run_apt_get(chroot, packages=packages,
-@@ -873,6 +878,7 @@ class Manager(object):
-                             force_ipv4_file=CONF.force_ipv4_file)
+@@ -873,5 +878,6 @@ class Manager(object):
              # restore disabled hosts/resolv files
              bu.restore_resolv_conf(chroot)
 +            bu.restore_newaliases(chroot)