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/0002-Build-bootstrap-image-for-arm64.patch | |
parent | 2662d9c5800b67d9375c22ccac439e3aeea3b4e5 (diff) | |
parent | e42a9b3011f96ad26f4a19db77ac44cad31a4290 (diff) |
Merge "Uplift Armband to Fuel Newton"
Diffstat (limited to 'patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch')
-rw-r--r-- | patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch index 836cb2cf..433c87fb 100644 --- a/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch +++ b/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch @@ -6,15 +6,13 @@ For now the arch is hardcoded for simplicity. We should detect this but how? If we're multi-arch then one bootstrap image should be built per supported arch. This requires Fuel refactoring. --- - .../0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch | 9 +++++++++ + .../0001-Patches-for-OPNFV.patch | 9 +++++++++ 1 file changed, 9 insertions(+) -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 -index c2e664c..12d0dfb 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 -@@ -73,6 +73,15 @@ index 3197c91..db3123d 100755 - +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 +--- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch ++++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch +@@ -45,3 +45,12 @@ # Enable iptables systemctl enable iptables.service +@@ -484,7 +490,7 @@ @@ -26,6 +24,4 @@ index c2e664c..12d0dfb 100644 + ret=0 + fuel notify --topic "done" --send "${bs_done_message}" + else - @@ -532,6 +545,16 @@ systemctl start ntpd - - bash /etc/rc.local + @@ -546,6 +560,16 @@ systemctl start ntpd |