diff options
Diffstat (limited to 'patches/fuel-agent')
3 files changed, 4 insertions, 7 deletions
diff --git a/patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch b/patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch index 54e8027e..b68ca4e4 100644 --- a/patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch +++ b/patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch @@ -70,12 +70,11 @@ index df54f65..ba1ab78 100644 import tempfile from oslo_config import cfg + from oslo_log import log as logging +from oslo_config import types import six import yaml - -@@ -34,6 +35,8 @@ from fuel_agent.utils import md as mu - from fuel_agent.utils import partition as pu +@@ -34,5 +35,7 @@ from fuel_agent.utils import md as mu from fuel_agent.utils import utils +ArchType = types.String(choices=['amd64', 'arm64']) diff --git a/patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch b/patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch index 75602951..8a0cbcf3 100644 --- a/patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch +++ b/patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch @@ -35,8 +35,7 @@ index 637c99a..86f76b9 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, -@@ -1084,6 +1089,7 @@ class Manager(object): - add_multipath_conf=False) +@@ -1084,5 +1089,6 @@ class Manager(object): # restore disabled hosts/resolv files bu.restore_resolv_conf(chroot) + bu.restore_newaliases(chroot) diff --git a/patches/fuel-agent/multiarch-efi/0002-Add-fs-for-efi-partition.patch b/patches/fuel-agent/multiarch-efi/0002-Add-fs-for-efi-partition.patch index c18c7093..7c05c69d 100644 --- a/patches/fuel-agent/multiarch-efi/0002-Add-fs-for-efi-partition.patch +++ b/patches/fuel-agent/multiarch-efi/0002-Add-fs-for-efi-partition.patch @@ -12,14 +12,13 @@ diff --git a/debian/control b/debian/control index e843980..c763ab9 100644 --- a/debian/control +++ b/debian/control -@@ -40,6 +40,7 @@ Depends: bzip2, +@@ -40,5 +40,6 @@ Depends: bzip2, qemu-user-static, binfmt-support, dmidecode, + dosfstools, ethtool, gdisk, - genisoimage, diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py index 94280e8..1463f22 100644 --- a/fuel_agent/drivers/nailgun.py |