From be5864d1622dc080718422b313cf9954b123c3b0 Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Wed, 20 Apr 2016 15:45:31 -0700 Subject: Cleanup patch-export bugs --- patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch | 2 +- patches/fuel-agent/0005-Add-esp-partition-flag.patch | 2 +- .../fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/fuel-agent') 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 b47518ce..96b0e630 100644 --- a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch +++ b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch @@ -36,7 +36,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): diff --git a/patches/fuel-agent/0005-Add-esp-partition-flag.patch b/patches/fuel-agent/0005-Add-esp-partition-flag.patch index a1990565..e90b283b 100644 --- a/patches/fuel-agent/0005-Add-esp-partition-flag.patch +++ b/patches/fuel-agent/0005-Add-esp-partition-flag.patch @@ -12,7 +12,7 @@ to properly format and mount it during do_partitioning deployment phase. 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py -index 3807ca7..bc532b4 100644 +index c2fef69..0ae81f9 100644 --- a/fuel_agent/drivers/nailgun.py +++ b/fuel_agent/drivers/nailgun.py @@ -324,7 +324,7 @@ class Nailgun(BaseDataDriver): diff --git a/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch index 38b70450..6dd23060 100644 --- a/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch +++ b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch @@ -17,7 +17,7 @@ TODO: At least make this arch-dependant for mos8 ... 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py -index c2fef69..3807ca7 100644 +index 0ae81f9..bc532b4 100644 --- a/fuel_agent/drivers/nailgun.py +++ b/fuel_agent/drivers/nailgun.py @@ -684,7 +684,7 @@ class NailgunBuildImage(BaseDataDriver): -- cgit 1.2.3-korg