diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-21 18:34:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-21 18:34:06 +0000 |
| commit | 4c74ad945b5b20be3014178070b495f10c16a74e (patch) | |
| tree | f76b2e9892bd056b3da3a03a0ad27c5f8d2bb9ab /patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch | |
| parent | 2662d9c5800b67d9375c22ccac439e3aeea3b4e5 (diff) | |
| parent | e42a9b3011f96ad26f4a19db77ac44cad31a4290 (diff) | |
Merge "Uplift Armband to Fuel Newton"
Diffstat (limited to 'patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch')
| -rw-r--r-- | patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch b/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch index 26b898fe..c3dc220c 100644 --- a/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch +++ b/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch @@ -68,15 +68,15 @@ index 0000000..01eb2e2 +fi + +echo "Done preparing cross-building" -diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch +diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch index 12d0dfb..81d196b 100644 ---- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch -+++ b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch -@@ -25,6 +25,19 @@ index 3197c91..db3123d 100755 +--- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch ++++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch +@@ -25,6 +25,18 @@ index 3197c91..db3123d 100755 bs_done_message="Default bootstrap image building done. Now you can boot new \ nodes over PXE, they will be discovered and become available for installing \ OpenStack on them" -+@@ -239,6 +239,12 @@ ++@@ -239,5 +239,11 @@ + # /etc/fuel_openstack_version is provided by 'fuel-openstack-metadata' package + OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version) + @@ -86,9 +86,8 @@ index 12d0dfb..81d196b 100644 ++ ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/dists/mos${FUEL_RELEASE}/Release > \ ++ /etc/fuel_openstack_arch ++ -+ # We do not ship debian-installer kernel and initrd on ISO. -+ # But we still need to be able to create ubuntu cobbler distro -+ # which requires kernel and initrd to be available. So, we - @@ -339,8 +339,22 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail ++ ++ touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml + @@ -347,8 +347,23 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail set +x echo "Done!" |