From cc6b43d58d2dfd08b7cbde4e24fb94f9c72bc825 Mon Sep 17 00:00:00 2001 From: anthony Date: Thu, 21 Oct 2010 18:28:22 -0700 Subject: [PATCH] bug 6546: support ubuntu 10.04 PV kernel, for ext3 requirement, we can file a seperate bug for it, the solution should be install ext4 module in xenserver status 6546: resolved fixed --- .../com/cloud/hypervisor/xen/resource/CitrixHelper.java | 1 + scripts/vm/hypervisor/xenserver/setupxenserver.sh | 7 ------- setup/db/templates.xenserver.sql | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java index b6032e04e94..6175043dbb5 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java @@ -155,6 +155,7 @@ public class CitrixHelper { _xenServerGuestOsMap.put("Windows Vista (32-bit)", "Windows Vista (32-bit)"); _xenServerGuestOsMap.put("Windows XP SP2 (32-bit)", "Windows XP SP2 (32-bit)"); _xenServerGuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)"); + _xenServerGuestOsMap.put("Other install media", "Other install media"); } public static String getXcpGuestOsType(String stdType) { diff --git a/scripts/vm/hypervisor/xenserver/setupxenserver.sh b/scripts/vm/hypervisor/xenserver/setupxenserver.sh index 848220dc768..08e949d2039 100755 --- a/scripts/vm/hypervisor/xenserver/setupxenserver.sh +++ b/scripts/vm/hypervisor/xenserver/setupxenserver.sh @@ -7,12 +7,6 @@ usage() { } -# avoid disk full -mv /etc/cron.daily/logrotate /etc/cron.hourly 2>&1 - -# more aio thread -echo 1048576 >/proc/sys/fs/aio-max-nr - #set iptables iptables -D RH-Firewall-1-INPUT -p tcp -m tcp --dport 5900:6099 -j ACCEPT 2>&1 iptables -I RH-Firewall-1-INPUT -p tcp -m tcp --dport 5900:6099 -j ACCEPT 2>&1 @@ -26,7 +20,6 @@ sed -i 's/127\.0\.0\.1/0\.0\.0\.0/' /opt/xensource/libexec/qemu-dm-wrapper 2>&1 # disable the default link local on xenserver sed -i /NOZEROCONF/d /etc/sysconfig/network echo "NOZEROCONF=yes" >> /etc/sysconfig/network ->/opt/xensource/bin/heartbeat echo "success" diff --git a/setup/db/templates.xenserver.sql b/setup/db/templates.xenserver.sql index 329cab65789..9d2c75482a6 100644 --- a/setup/db/templates.xenserver.sql +++ b/setup/db/templates.xenserver.sql @@ -81,6 +81,8 @@ INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (57, INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (58, 6, 'Windows XP SP3 (32-bit)', 'Windows XP SP3 (32-bit)'); INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (59, 7, 'Other install media', 'Ubuntu'); INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (60, 7, 'Other install media', 'Other'); +INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (61, 2, 'Ubuntu 10.04 (64-bit)', 'Ubuntu 10.04 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (62, 2, 'Ubuntu 10.04 (32-bit)', 'Ubuntu 10.04 (32-bit)'); -- temporarily added for vmware, will be moved when vmware support is fully in-place INSERT INTO `cloud`.`host_master`(`type`, `service_address`, `admin`, `password`) VALUES('VSphere', '192.168.90.238', 'Administrator', 'Suite219');