summaryrefslogtreecommitdiffstats
path: root/build/f_repos/patch/fuel-main
diff options
context:
space:
mode:
Diffstat (limited to 'build/f_repos/patch/fuel-main')
-rw-r--r--build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch12
-rw-r--r--build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch4
-rw-r--r--build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch4
3 files changed, 10 insertions, 10 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
diff --git a/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch b/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch
index 734523040..179cbdbd6 100644
--- a/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch
+++ b/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch
@@ -11,10 +11,10 @@ Related-Bug: #1498619
1 file changed, 1 insertion(+)
diff --git a/iso/module.mk b/iso/module.mk
-index 8995378..0073068 100644
+index ab7542b..755e706 100644
--- a/iso/module.mk
+++ b/iso/module.mk
-@@ -174,6 +174,7 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
+@@ -191,6 +191,7 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
-V $(ISO_VOLUME_ID) -p $(ISO_VOLUME_PREP) \
-J -R \
-graft-points \
diff --git a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
index b90fd1951..fb9e86917 100644
--- a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
+++ b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
@@ -19,7 +19,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config.mk b/config.mk
-index 7f7d965..83c3810 100644
+index e0b988b..593f105 100644
--- a/config.mk
+++ b/config.mk
@@ -48,7 +48,7 @@ UBUNTU_MINOR?=04
@@ -32,7 +32,7 @@ index 7f7d965..83c3810 100644
SEPARATE_IMAGES?=/boot,ext2 /,ext4
diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
-index 7a9466e..fe1ada2 100644
+index 5b4d762..b4fa99c 100644
--- a/mirror/ubuntu/module.mk
+++ b/mirror/ubuntu/module.mk
@@ -33,7 +33,7 @@ set -ex; ./debmirror --progress --checksums --nocleanup \