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:29:15 UTC
[1/5] git commit: updated refs/heads/4.4 to 99aa7a0
Repository: cloudstack
Updated Branches:
refs/heads/4.4 c934e7b05 -> 99aa7a096
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)
(cherry picked from commit af4e868547c215d511fbdd77f70e5e7b0303d3e5)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e35431d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e35431d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e35431d
Branch: refs/heads/4.4
Commit: 1e35431dec8f4cc58000b8d004c9aee5c228f62d
Parents: c934e7b
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:28:22 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/1e35431d/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/1e35431d/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() {
[2/5] git commit: updated refs/heads/4.4 to 99aa7a0
Posted by da...@apache.org.
blacklist pcspkr as cosmetic improvement. aesni_intel blacklisting was not working because the include only works if the file ends with .conf.
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit 11f532bbecca08b41dd15d1abdf04957c84eebda)
(cherry picked from commit f94ff4ad041c517b048ce8fc58ef3996b98aa685)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3394d3c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3394d3c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3394d3c4
Branch: refs/heads/4.4
Commit: 3394d3c4f5a828f01cfc48939149daf66706b85e
Parents: 1e35431
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Wed May 21 15:53:00 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 10 16:28:34 2014 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/modprobe.d/aesni_intel | 1 -
systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf | 1 +
systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3394d3c4/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
deleted file mode 100644
index 1c140f0..0000000
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
+++ /dev/null
@@ -1 +0,0 @@
-blacklist aesni_intel
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3394d3c4/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
new file mode 100644
index 0000000..1c140f0
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -0,0 +1 @@
+blacklist aesni_intel
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3394d3c4/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
new file mode 100644
index 0000000..da3dbd9
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -0,0 +1 @@
+blacklist pcspkr
\ No newline at end of file
[4/5] git commit: updated refs/heads/4.4 to 99aa7a0
Posted by da...@apache.org.
If for some reason dnsmasq.log does not exist anymore logrotate will create it with nobody as owner. This will prevent dnsmasq deamon from logging to that file.
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit c54ce3cafbc51febe71fb2a997dbfc8ac9167fb0)
(cherry picked from commit 94bb5c29b293b5eebc21c67124d429a59736f11a)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8ff5ca0b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8ff5ca0b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8ff5ca0b
Branch: refs/heads/4.4
Commit: 8ff5ca0b2f44ae3d4dd9f4dd11eaf94ff4fb740b
Parents: 4262080
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Wed May 21 17:10:07 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 10 16:28:51 2014 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/logrotate.d/dnsmasq | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ff5ca0b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
index 838415d3..2654590 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
+++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
@@ -8,6 +8,6 @@
postrotate
[ ! -f /var/run/dnsmasq/dnsmasq.pid ] || kill -USR2 `cat /var/run/dnsmasq/dnsmasq.pid`
endscript
- create 0640 nobody root
+ create 0640 dnsmasq root
}
[5/5] git commit: updated refs/heads/4.4 to 99aa7a0
Posted by da...@apache.org.
xenstore-utils on debian wheezy does not have /usr/sbin/xenstore so these commands file. It does have xenstore-write and xenstore-rm so by adding a - this is fixed easily.
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit 2e83baaca2c998cfdda281301dffb09a1a20aa5c)
(cherry picked from commit ed330d4dcdfbab70230e87654b5f7fb43db6c3ac)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99aa7a09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99aa7a09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99aa7a09
Branch: refs/heads/4.4
Commit: 99aa7a096ac53394fb55c9b26763fc1869409172
Parents: 8ff5ca0
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Thu May 22 15:25:45 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 10 16:29:01 2014 +0200
----------------------------------------------------------------------
systemvm/patches/debian/xe/xe-update-guest-attrs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99aa7a09/systemvm/patches/debian/xe/xe-update-guest-attrs
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/xe/xe-update-guest-attrs b/systemvm/patches/debian/xe/xe-update-guest-attrs
index 30a4498..6c605be 100644
--- a/systemvm/patches/debian/xe/xe-update-guest-attrs
+++ b/systemvm/patches/debian/xe/xe-update-guest-attrs
@@ -74,7 +74,7 @@ xenstore_write_cached() {
fi
# try to write and update cache if successfull
- if $XENSTORE write "$key" "$newval" ; then
+ if $XENSTORE-write "$key" "$newval" ; then
mkdir -p $(dirname "$cache")
echo -n "$newval" > "$cache"
XENSTORE_UPDATED=1
@@ -104,7 +104,7 @@ xenstore_rm_cached() {
return 1
fi
# try to write and update cache if successfull
- if $XENSTORE rm "$key" ; then
+ if $XENSTORE-rm "$key" ; then
rm -rf "$cache"
XENSTORE_UPDATED=1
return 0
[3/5] git commit: updated refs/heads/4.4 to 99aa7a0
Posted by da...@apache.org.
rats
(cherry picked from commit b85dd956f8187ea2810f4fd74728c0a430ce6ef4)
(cherry picked from commit 5eb026534929774d468976870979440b88f7a5b8)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4262080b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4262080b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4262080b
Branch: refs/heads/4.4
Commit: 4262080ba49fc8f0dc8c4f29f94159e3e8cbad50
Parents: 3394d3c
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jun 10 16:21:06 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 10 16:28:41 2014 +0200
----------------------------------------------------------------------
.../debian/config/etc/modprobe.d/aesni_intel.conf | 16 ++++++++++++++++
.../debian/config/etc/modprobe.d/pcspkr.conf | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4262080b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
index 1c140f0..2bc7cb1 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
blacklist aesni_intel
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4262080b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
index da3dbd9..892b51f 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
blacklist pcspkr
\ No newline at end of file