Updated Branches: refs/heads/master 6df0ff259 -> 82dc16e58
CLOUDSTACK-1066: no need for build helpers. Also reduces attack surface of system vm CLOUDSTACK-1066: no need for busybox and dictionaries CLOUDSTACK-1066: fix bug in generating signature CLOUDSTACK-1066: don't confuse veewee about root password Clean up stuff copied in to vm by veewee Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/82dc16e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/82dc16e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/82dc16e5 Branch: refs/heads/master Commit: 82dc16e58a093a448cfc752d6a35445748e6de3a Parents: 31791e2 Author: Chiradeep Vittal <[email protected]> Authored: Fri Feb 8 12:28:51 2013 -0800 Committer: Chiradeep Vittal <[email protected]> Committed: Fri Feb 8 12:52:41 2013 -0800 ---------------------------------------------------------------------- .../appliance/definitions/systemvmtemplate/base.sh | 4 ++-- .../definitions/systemvmtemplate/cleanup.sh | 7 ++++++- .../systemvmtemplate/cloudstack-packages.sh | 1 + .../definitions/systemvmtemplate/definition.rb | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/82dc16e5/tools/appliance/definitions/systemvmtemplate/base.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/base.sh b/tools/appliance/definitions/systemvmtemplate/base.sh index 6b44e0a..a6b69e6 100644 --- a/tools/appliance/definitions/systemvmtemplate/base.sh +++ b/tools/appliance/definitions/systemvmtemplate/base.sh @@ -1,8 +1,8 @@ # 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 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 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/82dc16e5/tools/appliance/definitions/systemvmtemplate/cleanup.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh b/tools/appliance/definitions/systemvmtemplate/cleanup.sh index bf8a619..886bc59 100644 --- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh +++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh @@ -1,6 +1,8 @@ # Clean up -apt-get -y remove linux-headers-$(uname -r) build-essential +#apt-get -y remove linux-headers-$(uname -r) build-essential +apt-get -y remove dictionaries-common busybox apt-get -y autoremove +apt-get clean # Removing leftover leases and persistent rules echo "cleaning up dhcp leases" @@ -15,3 +17,6 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules echo "Adding a 2 sec delay to the interface up, to make the dhclient happy" echo "pre-up sleep 2" >> /etc/network/interfaces + +#clean up stuff copied in by veewee +rm -f /root/* http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/82dc16e5/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh b/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh index fc8c12d..9870191 100644 --- a/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh +++ b/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh @@ -77,6 +77,7 @@ do_fixes() { } signature() { + mkdir -p /var/cache/cloud/ touch /var/cache/cloud/cloud-scripts-signature echo "Cloudstack Release $CLOUDSTACK_RELEASE $(date)" > /etc/cloudstack-release } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/82dc16e5/tools/appliance/definitions/systemvmtemplate/definition.rb ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb index cc2f972..406f613 100644 --- a/tools/appliance/definitions/systemvmtemplate/definition.rb +++ b/tools/appliance/definitions/systemvmtemplate/definition.rb @@ -46,7 +46,7 @@ Veewee::Definition.declare({ :kickstart_file => "preseed.cfg", :ssh_login_timeout => "10000", :ssh_user => "root", - :ssh_password => "vagrant", + :ssh_password => "password", :ssh_key => "", :ssh_host_port => "7222", :ssh_guest_port => "22",
