You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2018/03/28 07:52:51 UTC
[cloudstack] branch master updated (95d10c2 -> ba61b51)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 95d10c2 [Merge 4.11] CLOUDSTACK-10227: Fix mkdir path for centos rpms (#2513)
add 986ecfa CLOUDSTACK-10341: Reduce systemvmtemplate size, install nftables (#2506)
new ba61b51 [Merge 4.11] CLOUDSTACK-10341: Reduce systemvmtemplate size (#2506)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
test/integration/smoke/test_vpc_redundant.py | 7 ++++---
tools/appliance/build.sh | 8 ++++----
tools/appliance/systemvmtemplate/http/preseed.cfg | 10 +++++-----
tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh | 3 +--
tools/appliance/systemvmtemplate/scripts/cleanup.sh | 2 ++
.../systemvmtemplate/scripts/install_systemvm_packages.sh | 4 +++-
tools/appliance/systemvmtemplate/template.json | 2 +-
7 files changed, 20 insertions(+), 16 deletions(-)
--
To stop receiving notification emails like this one, please contact
rohit@apache.org.
[cloudstack] 01/01: [Merge 4.11] CLOUDSTACK-10341: Reduce
systemvmtemplate size (#2506)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit ba61b512b2b1006d7164e039a3cb57db9ba64fab
Merge: 95d10c2 986ecfa
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Mar 28 13:18:12 2018 +0530
[Merge 4.11] CLOUDSTACK-10341: Reduce systemvmtemplate size (#2506)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
test/integration/smoke/test_vpc_redundant.py | 7 ++++---
tools/appliance/build.sh | 8 ++++----
tools/appliance/systemvmtemplate/http/preseed.cfg | 10 +++++-----
tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh | 3 +--
tools/appliance/systemvmtemplate/scripts/cleanup.sh | 2 ++
.../systemvmtemplate/scripts/install_systemvm_packages.sh | 4 +++-
tools/appliance/systemvmtemplate/template.json | 2 +-
7 files changed, 20 insertions(+), 16 deletions(-)
diff --cc tools/appliance/build.sh
index 893404d,ba6fe4d..edbe11f
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@@ -198,10 -194,8 +198,10 @@@ function create_definition()
cp -r "${appliance}" "${appliance_build_name}"
set +e
if [ ! -z "${version}" ]; then
- if [ -f "${appliance_build_name}/scripts/configure_systemvm_services.sh" ]; then
- sed ${sed_regex_option} -i -e "s/^CLOUDSTACK_RELEASE=.+/CLOUDSTACK_RELEASE=${version}/" \
- "${appliance_build_name}/scripts/configure_systemvm_services.sh"
- fi
- sed ${sed_regex_option} -i -e "s/^CLOUDSTACK_RELEASE=.+/CLOUDSTACK_RELEASE=${version}/" \
- "${appliance_build_name}/scripts/configure_systemvm_services.sh"
++ if [ -f "${appliance_build_name}/scripts/configure_systemvm_services.sh" ]; then
++ sed ${sed_regex_option} -i -e "s/^CLOUDSTACK_RELEASE=.+/CLOUDSTACK_RELEASE=${version}/" \
++ "${appliance_build_name}/scripts/configure_systemvm_services.sh"
++ fi
fi
set -e
add_on_exit rm -rf "${appliance_build_name}"
--
To stop receiving notification emails like this one, please contact
rohit@apache.org.