From 6c04d867b0a70dd00fa8e4dcf3f0701a5f1feeb2 Mon Sep 17 00:00:00 2001 From: Harikrishna Patnala Date: Fri, 31 Oct 2014 18:50:17 +0530 Subject: [PATCH] CLOUDSTACK-7660: Enhance system vm template to support baremetal Installed flask package and removed the disk expert recipe in system vm template to keep only one partition Signed-off-by: Frank Zhang --- .../install_systemvm_packages.sh | 1 + .../definitions/systemvmtemplate/preseed.cfg | 41 ------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh index 31ba2d4f91f..0cb2a92a2de 100644 --- a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh +++ b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh @@ -71,6 +71,7 @@ function install_packages() { iptables-persistent \ libtcnative-1 libssl-dev libapr1-dev \ open-vm-tools \ + python-flask \ haproxy \ radvd \ sharutils diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg index 0d2f70b3d0b..832a2966eb3 100644 --- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg +++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg @@ -42,47 +42,6 @@ d-i clock-setup/ntp boolean true d-i partman-auto/disk string /dev/sda d-i partman-auto/method string regular d-i partman-auto/choose_recipe select atomic -d-i partman-auto/expert_recipe string \ - boot-root :: \ - 30 50 100 ext4 \ - $primary{ } $bootable{ } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /boot } \ - . \ - 400 40 500 ext4 \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ / } \ - . \ - 50 100 200 ext4 \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /home } \ - . \ - 700 70 1100 ext4 \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /usr } \ - . \ - 400 40 500 ext4 \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /opt } \ - . \ - 450 70 1000 ext4 \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /var } \ - . \ - 50 60 100 ext4 \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /tmp } \ - . \ - 70 100 256 linux-swap \ - method{ swap } format{ } \ - . d-i partman/confirm_write_new_label boolean true d-i partman/choose_partition select finish d-i partman/confirm boolean true