diff options
Diffstat (limited to 'patches/fuel-agent')
| -rw-r--r-- | patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch | 7 | ||||
| -rw-r--r-- | patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch | 3 | ||||
| -rw-r--r-- | patches/fuel-agent/0005-Add-esp-partition-flag.patch | 10 | ||||
| -rw-r--r-- | patches/fuel-agent/0007-Add-fs-for-efi-partition.patch | 28 | ||||
| -rw-r--r-- | patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch (renamed from patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch) | 0 |
5 files changed, 22 insertions, 26 deletions
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 96b0e630..6f28d8a3 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 @@ -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 7f6d2c3d..37017e1a 100644 --- 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) diff --git a/patches/fuel-agent/0005-Add-esp-partition-flag.patch b/patches/fuel-agent/0005-Add-esp-partition-flag.patch index e90b283b..2ecec416 100644 --- a/patches/fuel-agent/0005-Add-esp-partition-flag.patch +++ b/patches/fuel-agent/0005-Add-esp-partition-flag.patch @@ -16,11 +16,11 @@ index c2fef69..0ae81f9 100644 --- a/fuel_agent/drivers/nailgun.py +++ b/fuel_agent/drivers/nailgun.py @@ -324,7 +324,7 @@ class Nailgun(BaseDataDriver): - # uefi partition (for future use) - LOG.debug('Adding UEFI partition on disk %s: size=200' % - disk['name']) -- parted.add_partition(size=200) -+ parted.add_partition(size=200, flags=['esp']) + # uefi partition (for future use) + LOG.debug('Adding UEFI partition on disk %s: size=200' % + disk['name']) +- parted.add_partition(size=200) ++ parted.add_partition(size=200, flags=['esp']) LOG.debug('Looping over all volumes on disk %s' % disk['name']) for volume in disk['volumes']: diff --git a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch b/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch index dbbde129..0fb94215 100644 --- a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch +++ b/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch @@ -35,20 +35,20 @@ index bc532b4..f092865 100644 # has already been added. we need this to # get rid of md over all disks for /boot partition. @@ -321,10 +324,14 @@ class Nailgun(BaseDataDriver): - LOG.debug('Adding bios_grub partition on disk %s: size=24' % - disk['name']) - parted.add_partition(size=24, flags=['bios_grub']) -- # uefi partition (for future use) -- LOG.debug('Adding UEFI partition on disk %s: size=200' % -+ # uefi partition - added only once. -+ if self._is_boot_disk(disk) and not self._esp_partition_done: -+ LOG.debug('Adding UEFI partition on disk %s: size=200' % - disk['name']) -- parted.add_partition(size=200, flags=['esp']) -+ prt = parted.add_partition(size=200, flags=['esp']) -+ partition_scheme.add_fs(device=prt.name, mount='/boot/efi', -+ fs_type='vfat') -+ self._esp_partition_done = True + LOG.debug('Adding bios_grub partition on disk %s: size=24' % + disk['name']) + parted.add_partition(size=24, flags=['bios_grub']) +- # uefi partition (for future use) +- LOG.debug('Adding UEFI partition on disk %s: size=200' % ++ # uefi partition - added only once. ++ if self._is_boot_disk(disk) and not self._esp_partition_done: ++ LOG.debug('Adding UEFI partition on disk %s: size=200' % + disk['name']) +- parted.add_partition(size=200, flags=['esp']) ++ prt = parted.add_partition(size=200, flags=['esp']) ++ partition_scheme.add_fs(device=prt.name, mount='/boot/efi', ++ fs_type='vfat') ++ self._esp_partition_done = True LOG.debug('Looping over all volumes on disk %s' % disk['name']) for volume in disk['volumes']: diff --git a/patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch b/patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch index b0c32f4f..b0c32f4f 100644 --- a/patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch +++ b/patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch |