diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-02-15 23:53:42 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-02-15 23:54:52 +0100 |
| commit | cdc4065cc4c3dc1b3f3cd84b0d875b2acd72c4de (patch) | |
| tree | ac066a2f73f4f737775631e8839c745cc78923ec /build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch | |
| parent | 14669b1166d65270fbce9dabd957b643f74e7513 (diff) | |
f_repos: patch: Rebase patches, cleanup
While at it, re-export patches to remove any redundant info:
$ make patches-export
Change-Id: I4ce3aba9f9d6092bade305a744738c44a936db7c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch')
| -rw-r--r-- | build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 d01ce8bf3..bf0f331db 100644 --- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch +++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch @@ -7,13 +7,13 @@ Subject: [PATCH] Patches for OPNFV 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh -index dbcac5f..1826390 100755 +index dbcac5f..472e418 100755 --- a/iso/bootstrap_admin_node.sh +++ b/iso/bootstrap_admin_node.sh @@ -347,8 +347,23 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail set +x echo "Done!" - + +### OPNFV addition BEGIN +shopt -s nullglob +for script in /opt/opnfv/bootstrap/pre.d/*.sh @@ -37,18 +37,18 @@ index dbcac5f..1826390 100755 echo @@ -386,8 +401,7 @@ if [ ! -f /etc/fuel_build_id ]; then fi - + # Enable sshd -systemctl enable sshd -systemctl start sshd +systemctl restart sshd - + # Enable iptables systemctl enable iptables.service @@ -546,6 +560,16 @@ systemctl start ntpd - + bash /etc/rc.local - + +### OPNFV addition BEGIN +shopt -s nullglob +for script in /opt/opnfv/bootstrap/post.d/*.sh |