Updated Branches: refs/heads/master 7efbcfa9b -> ed79b8bf1
CLOUDSTACK-1867: Comment vmware-tools installation, use open-vm-tools Signed-off-by: Rohit Yadav <bhais...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed79b8bf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed79b8bf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed79b8bf Branch: refs/heads/master Commit: ed79b8bf140196a169a89021a4d02747d5312ad8 Parents: 7efbcfa Author: Rohit Yadav <bhais...@apache.org> Authored: Wed Apr 10 23:10:29 2013 +0530 Committer: Rohit Yadav <bhais...@apache.org> Committed: Wed Apr 10 23:14:50 2013 +0530 ---------------------------------------------------------------------- .../definitions/systemvmtemplate/postinstall.sh | 27 ++++++++------- .../definitions/systemvmtemplate/preseed.cfg | 8 ++-- .../definitions/systemvmtemplate64/postinstall.sh | 27 ++++++++------- .../definitions/systemvmtemplate64/preseed.cfg | 8 ++-- 4 files changed, 36 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed79b8bf/tools/appliance/definitions/systemvmtemplate/postinstall.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh index 176c93f..ae8f1ad 100644 --- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh @@ -65,18 +65,19 @@ install_packages() { # vmware tools apt-get --no-install-recommends -q -y --force-yes install open-vm-tools - apt-get --no-install-recommends -q -y --force-yes install build-essential linux-headers-`uname -r` - df -h - PREVDIR=$PWD - cd /opt - wget http://people.apache.org/~bhaisaab/cloudstack/VMwareTools-9.2.1-818201.tar.gz - tar xzf VMwareTools-9.2.1-818201.tar.gz - rm VMwareTools-*.tar.gz - cd vmware-tools-distrib - ./vmware-install.pl -d - cd $PREV - rm -fr /opt/vmware-tools-distrib - apt-get -q -y --force-yes purge build-essential + # commented installaion of vmware-tools as we are using the opensource open-vm-tools: + # apt-get --no-install-recommends -q -y --force-yes install build-essential linux-headers-`uname -r` + # df -h + # PREVDIR=$PWD + # cd /opt + # wget http://people.apache.org/~bhaisaab/cloudstack/VMwareTools-9.2.1-818201.tar.gz + # tar xzf VMwareTools-9.2.1-818201.tar.gz + # rm VMwareTools-*.tar.gz + # cd vmware-tools-distrib + # ./vmware-install.pl -d + # cd $PREV + # rm -fr /opt/vmware-tools-distrib + # apt-get -q -y --force-yes purge build-essential } setup_accounts() { @@ -184,7 +185,7 @@ configure_services() { snapshot_url="https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=snapshot;h=HEAD;sf=tgz" snapshot_dir="/opt/cloudstack*" cd /opt - wget $snapshot_url -O cloudstack.tar.gz + wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz tar -zxvf cloudstack.tar.gz cp -rv $snapshot_dir/patches/systemvm/debian/config/* / cp -rv $snapshot_dir/patches/systemvm/debian/vpn/* / http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed79b8bf/tools/appliance/definitions/systemvmtemplate/preseed.cfg ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg index d456256..79349f6 100644 --- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg +++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg @@ -136,7 +136,7 @@ d-i partman-auto/expert_recipe string \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /boot } \ . \ - 250 40 400 ext4 \ + 300 40 400 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ / } \ @@ -146,17 +146,17 @@ d-i partman-auto/expert_recipe string \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /home } \ . \ - 900 20 1100 ext4 \ + 700 20 1100 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /usr } \ . \ - 300 40 500 ext4 \ + 400 40 500 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /opt } \ . \ - 450 60 1000 ext4 \ + 500 60 1000 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /var } \ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed79b8bf/tools/appliance/definitions/systemvmtemplate64/postinstall.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh index 176c93f..ae8f1ad 100644 --- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh @@ -65,18 +65,19 @@ install_packages() { # vmware tools apt-get --no-install-recommends -q -y --force-yes install open-vm-tools - apt-get --no-install-recommends -q -y --force-yes install build-essential linux-headers-`uname -r` - df -h - PREVDIR=$PWD - cd /opt - wget http://people.apache.org/~bhaisaab/cloudstack/VMwareTools-9.2.1-818201.tar.gz - tar xzf VMwareTools-9.2.1-818201.tar.gz - rm VMwareTools-*.tar.gz - cd vmware-tools-distrib - ./vmware-install.pl -d - cd $PREV - rm -fr /opt/vmware-tools-distrib - apt-get -q -y --force-yes purge build-essential + # commented installaion of vmware-tools as we are using the opensource open-vm-tools: + # apt-get --no-install-recommends -q -y --force-yes install build-essential linux-headers-`uname -r` + # df -h + # PREVDIR=$PWD + # cd /opt + # wget http://people.apache.org/~bhaisaab/cloudstack/VMwareTools-9.2.1-818201.tar.gz + # tar xzf VMwareTools-9.2.1-818201.tar.gz + # rm VMwareTools-*.tar.gz + # cd vmware-tools-distrib + # ./vmware-install.pl -d + # cd $PREV + # rm -fr /opt/vmware-tools-distrib + # apt-get -q -y --force-yes purge build-essential } setup_accounts() { @@ -184,7 +185,7 @@ configure_services() { snapshot_url="https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=snapshot;h=HEAD;sf=tgz" snapshot_dir="/opt/cloudstack*" cd /opt - wget $snapshot_url -O cloudstack.tar.gz + wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz tar -zxvf cloudstack.tar.gz cp -rv $snapshot_dir/patches/systemvm/debian/config/* / cp -rv $snapshot_dir/patches/systemvm/debian/vpn/* / http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed79b8bf/tools/appliance/definitions/systemvmtemplate64/preseed.cfg ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate64/preseed.cfg b/tools/appliance/definitions/systemvmtemplate64/preseed.cfg index d456256..79349f6 100644 --- a/tools/appliance/definitions/systemvmtemplate64/preseed.cfg +++ b/tools/appliance/definitions/systemvmtemplate64/preseed.cfg @@ -136,7 +136,7 @@ d-i partman-auto/expert_recipe string \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /boot } \ . \ - 250 40 400 ext4 \ + 300 40 400 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ / } \ @@ -146,17 +146,17 @@ d-i partman-auto/expert_recipe string \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /home } \ . \ - 900 20 1100 ext4 \ + 700 20 1100 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /usr } \ . \ - 300 40 500 ext4 \ + 400 40 500 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /opt } \ . \ - 450 60 1000 ext4 \ + 500 60 1000 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /var } \