Sync systemvm and systemvm64 build instructions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3df97bd6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3df97bd6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3df97bd6 Branch: refs/heads/rbac Commit: 3df97bd663c6a7e605816996b8bf02d3dec3730f Parents: a24263f Author: Hugo Trippaers <htrippa...@schubergphilis.com> Authored: Wed Feb 5 11:19:41 2014 +0100 Committer: Hugo Trippaers <htrippa...@schubergphilis.com> Committed: Wed Feb 5 11:21:23 2014 +0100 ---------------------------------------------------------------------- .../appliance/definitions/systemvm64template/base.sh | 6 +++--- .../definitions/systemvm64template/postinstall.sh | 14 +++++++------- tools/appliance/definitions/systemvmtemplate/base.sh | 4 +--- .../definitions/systemvmtemplate/postinstall.sh | 10 ++++++++-- 4 files changed, 19 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3df97bd6/tools/appliance/definitions/systemvm64template/base.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvm64template/base.sh b/tools/appliance/definitions/systemvm64template/base.sh index 46c5db6..bc03ffe 100644 --- a/tools/appliance/definitions/systemvm64template/base.sh +++ b/tools/appliance/definitions/systemvm64template/base.sh @@ -1,11 +1,11 @@ # Update the box apt-get -y update -#apt-get -y install linux-headers-$(uname -r) build-essential -#apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev apt-get -y install curl unzip +apt-get clean -# Set up sudo +# Set up sudo, TODO: Check security concerns echo 'vagrant ALL=NOPASSWD:/bin/chmod, /bin/cp, /bin/mkdir, /bin/mount, /bin/umount' > /etc/sudoers.d/vagrant +echo 'cloud ALL=NOPASSWD:/bin/chmod, /bin/cp, /bin/mkdir, /bin/mount, /bin/umount' > /etc/sudoers.d/cloud # Tweak sshd to prevent DNS resolution (speed up logins) echo 'UseDNS no' >> /etc/ssh/sshd_config http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3df97bd6/tools/appliance/definitions/systemvm64template/postinstall.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh index 1eddbdb..a9e0b89 100644 --- a/tools/appliance/definitions/systemvm64template/postinstall.sh +++ b/tools/appliance/definitions/systemvm64template/postinstall.sh @@ -19,7 +19,7 @@ set -x ROOTPW=password HOSTNAME=systemvm -CLOUDSTACK_RELEASE=4.3.0 +CLOUDSTACK_RELEASE=4.4.0 add_backports () { sed -i '/backports/d' /etc/apt/sources.list @@ -27,7 +27,6 @@ add_backports () { apt-get update } - install_packages() { DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical @@ -51,8 +50,8 @@ install_packages() { apt-get --no-install-recommends -q -y --force-yes install nfs-common # nfs irqbalance apt-get --no-install-recommends -q -y --force-yes install irqbalance - - # cifs client + + # cifs client apt-get --no-install-recommends -q -y --force-yes install samba-common apt-get --no-install-recommends -q -y --force-yes install cifs-utils @@ -76,12 +75,13 @@ install_packages() { echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections apt-get --no-install-recommends -q -y --force-yes install iptables-persistent - # Hyperv kvp daemon + # Hyperv kvp daemon - 64bit only # Download the hv kvp daemon wget http://people.apache.org/~rajeshbattala/hv-kvp-daemon_3.1_amd64.deb dpkg -i hv-kvp-daemon_3.1_amd64.deb + #libraries required for rdp client (Hyper-V) - apt-get --no-install-recommends -q -y --force-yes install libtcnative-1 libssl-dev libapr1-dev + apt-get --no-install-recommends -q -y --force-yes install libtcnative-1 libssl-dev libapr1-dev # vmware tools apt-get --no-install-recommends -q -y --force-yes install open-vm-tools @@ -221,7 +221,7 @@ configure_services() { snapshot_dir="/opt/cloudstack*" cd /opt wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz - tar -zxvf cloudstack.tar.gz + tar -zxvf cloudstack.tar.gz 'cloudstack-HEAD-???????/systemvm' cp -rv $snapshot_dir/systemvm/patches/debian/config/* / cp -rv $snapshot_dir/systemvm/patches/debian/vpn/* / mkdir -p /usr/share/cloud/ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3df97bd6/tools/appliance/definitions/systemvmtemplate/base.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/base.sh b/tools/appliance/definitions/systemvmtemplate/base.sh index 5aaa0ed..bc03ffe 100644 --- a/tools/appliance/definitions/systemvmtemplate/base.sh +++ b/tools/appliance/definitions/systemvmtemplate/base.sh @@ -1,12 +1,10 @@ # Update the box apt-get -y update -#below are needed for ruby perhaps -#apt-get -y install linux-headers-$(uname -r) build-essential -#apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev apt-get -y install curl unzip apt-get clean # Set up sudo, TODO: Check security concerns +echo 'vagrant ALL=NOPASSWD:/bin/chmod, /bin/cp, /bin/mkdir, /bin/mount, /bin/umount' > /etc/sudoers.d/vagrant echo 'cloud ALL=NOPASSWD:/bin/chmod, /bin/cp, /bin/mkdir, /bin/mount, /bin/umount' > /etc/sudoers.d/cloud # Tweak sshd to prevent DNS resolution (speed up logins) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3df97bd6/tools/appliance/definitions/systemvmtemplate/postinstall.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh index 175fc1f..d613483 100644 --- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh @@ -19,7 +19,7 @@ set -x ROOTPW=password HOSTNAME=systemvm -CLOUDSTACK_RELEASE=4.2.0 +CLOUDSTACK_RELEASE=4.4.0 add_backports () { sed -i '/backports/d' /etc/apt/sources.list @@ -51,6 +51,9 @@ install_packages() { # nfs irqbalance apt-get --no-install-recommends -q -y --force-yes install irqbalance + # cifs client + apt-get --no-install-recommends -q -y --force-yes install samba-common + apt-get --no-install-recommends -q -y --force-yes install cifs-utils # vpn stuff apt-get --no-install-recommends -q -y --force-yes install xl2tpd bcrelay ppp ipsec-tools tdb-tools @@ -72,6 +75,9 @@ install_packages() { echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections apt-get --no-install-recommends -q -y --force-yes install iptables-persistent + #libraries required for rdp client (Hyper-V) + apt-get --no-install-recommends -q -y --force-yes install libtcnative-1 libssl-dev libapr1-dev + # vmware tools apt-get --no-install-recommends -q -y --force-yes install open-vm-tools # commented installaion of vmware-tools as we are using the opensource open-vm-tools: @@ -205,7 +211,7 @@ configure_services() { snapshot_dir="/opt/cloudstack*" cd /opt wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz - tar -zxvf cloudstack.tar.gz + tar -zxvf cloudstack.tar.gz 'cloudstack-HEAD-???????/systemvm' cp -rv $snapshot_dir/systemvm/patches/debian/config/* / cp -rv $snapshot_dir/systemvm/patches/debian/vpn/* / mkdir -p /usr/share/cloud/
