You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/10 16:24:33 UTC
git commit: updated refs/heads/4.4-forward to af4e868
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 5bcd017de -> af4e86854
By preloading some modules we fix two things. 1. Some sysctl settings like ip_conntrack_max are not set during boot because the module is not loaded at that time. 2. Passive ftp does not work through iptables without these modules.
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit bfccf439cfe120f5d1380a642e8b798335e1cf2e)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/af4e8685
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/af4e8685
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/af4e8685
Branch: refs/heads/4.4-forward
Commit: af4e868547c215d511fbdd77f70e5e7b0303d3e5
Parents: 5bcd017
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Wed May 21 15:22:15 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 10 16:24:17 2014 +0200
----------------------------------------------------------------------
.../definitions/systemvm64template/postinstall.sh | 11 +++++++++++
.../definitions/systemvmtemplate/postinstall.sh | 11 +++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af4e8685/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index f6e6cdd..b1e4430 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -188,6 +188,16 @@ fix_vhdutil() {
chmod a+x /bin/vhd-util
}
+# Preload these module otherwise the sysctl settings will not be set, and pasive ftp will not work.
+fix_modules() {
+ cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
do_fixes() {
fix_nameserver
fix_inittab
@@ -195,6 +205,7 @@ do_fixes() {
fix_hostname
fix_locale
fix_vhdutil
+ fix_modules
}
configure_apache2() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af4e8685/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 23e66dd..b3edeb7 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -178,6 +178,16 @@ fix_vhdutil() {
chmod a+x /bin/vhd-util
}
+# Preload these module otherwise the sysctl settings will not be set, and pasive ftp will not work.
+fix_modules() {
+ cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
do_fixes() {
fix_nameserver
fix_inittab
@@ -185,6 +195,7 @@ do_fixes() {
fix_hostname
fix_locale
fix_vhdutil
+ fix_modules
}
configure_apache2() {