CLOUDSTACK-1340: Remove any shared folders, don't install legacy grub Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0b07bc97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0b07bc97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0b07bc97 Branch: refs/heads/vim51_win8 Commit: 0b07bc974a9b5ac2ab650f1c99f3c317768c9970 Parents: 68b836d Author: Rohit Yadav <[email protected]> Authored: Fri Mar 1 15:07:40 2013 +0530 Committer: Rohit Yadav <[email protected]> Committed: Fri Mar 1 15:08:19 2013 +0530 ---------------------------------------------------------------------- tools/appliance/build.sh | 9 +++++++++ .../definitions/systemvmtemplate/postinstall.sh | 3 ++- 2 files changed, 11 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0b07bc97/tools/appliance/build.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index f0ac377..eeee54b 100644 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -42,6 +42,15 @@ done machine_uuid=`vboxmanage showvminfo $appliance | grep UUID | head -1 | awk '{print $2}'` hdd_uuid=`vboxmanage showvminfo $appliance | grep vdi | head -1 | awk '{print $8}' | cut -d ')' -f 1` hdd_path=`vboxmanage list hdds | grep $appliance | grep vdi | cut -c 14-` +shared_folders=`vboxmanage showvminfo $appliance | grep Name | grep Host | cut -c 8- | cut -d \' -f 1` + +# Remove any shared folder +while [[ $shared_folders != "" ]] +do + folder=`echo $folders|head -1` + vboxmanage sharedfolder remove systemvmtemplate --name $folder + shared_folders=`echo $shared_folders | grep -v $folder` +done # Compact the virtual hdd vboxmanage modifyhd $hdd_uuid --compact http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0b07bc97/tools/appliance/definitions/systemvmtemplate/postinstall.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh index 268379c..dd07e6e 100644 --- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh @@ -27,7 +27,8 @@ install_packages() { # Basic packages apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables - apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl grub-legacy e2fsprogs dhcp3-client tcpdump socat wget + apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl e2fsprogs dhcp3-client tcpdump socat wget + # apt-get --no-install-recommends -q -y --force-yes install grub-legacy apt-get --no-install-recommends -q -y --force-yes install python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping apt-get --no-install-recommends -q -y --force-yes install dnsutils zip unzip ethtool uuid file iproute acpid virt-what sudo
