summaryrefslogtreecommitdiffstats
path: root/setup.py
blob: 7eeb36b53c3b6b184e0c67bc660eaf757a70e49c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
#!/usr/bin/env python
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#    http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools

setuptools.setup(
    setup_requires=['pbr'],
    pbr=True)
binfmt-support, dmidecode, + dosfstools, ethtool, gdisk, genisoimage, diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py index bc532b4..f092865 100644 --- a/fuel_agent/drivers/nailgun.py +++ b/fuel_agent/drivers/nailgun.py @@ -81,6 +81,9 @@ class Nailgun(BaseDataDriver): # was already allocated on first matching volume # or not self._boot_partition_done = False + # this var states whether ESP partition was already + # allocated on the first matching volume or not + self._esp_partition_done = False # this var is used as a flag that /boot fs # 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('Looping over all volumes on disk %s' % disk['name']) for volume in disk['volumes']: diff --git a/specs/fuel-agent.spec b/specs/fuel-agent.spec index a43f693..c2b9b51 100644 --- a/specs/fuel-agent.spec +++ b/specs/fuel-agent.spec @@ -50,6 +50,7 @@ Requires: xfsprogs Requires: pciutils Requires: ethtool Requires: debootstrap +Requires: dosfstools Requires: dpkg Requires: qemu-user-static Requires: xz